Jinsuk Kim 62ba538b94 resolved conflicts for merge of 3170c035 to lmp-mr1-dev ...

Change-Id: Ia34a304451f0dd7148d6d0cbd1d8c8ca81001b86

2014-10-11 07:23:18 +09:00

..

java/com/android/server

resolved conflicts for merge of 3170c035 to lmp-mr1-dev

2014-10-11 07:23:18 +09: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

…