Griff Hazen 6e1eb1c966 am aec92e2e: Merge "Disable zen log printouts by default" into lmp-sprout-dev ...

* commit 'aec92e2eca4b4197ac45dcde265e2797c7ea9133':
  Disable zen log printouts by default

2014-10-20 21:46:12 +00:00

..

java/com/android/server

am aec92e2e: Merge "Disable zen log printouts by default" into lmp-sprout-dev

2014-10-20 21:46:12 +00:00

jni

Merge "USB string descriptors are not UTF8, so it is not safe to treat them as such." into lmp-dev

2014-09-19 02:00:26 +00:00

Android.mk

…