Narayan Kamath 7377998dac resolved conflicts for merge of a42f7c1d to lmp-sprout-dev ...

Change-Id: I8e53c9d7e0014b4ffc621c561b737aa2dae5460c

2014-11-26 10:39:08 +00:00

..

java/com/android/server

resolved conflicts for merge of a42f7c1d to lmp-sprout-dev

2014-11-26 10:39:08 +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

…