Andreas Gampe dc9c109af8 resolved conflicts for merge of 487ae9b8 to lmp-mr1-dev-plus-aosp ...

Change-Id: I395f184d885a7ef30aa113ab01fcaacc94243008

2014-11-07 15:14:02 -08:00

..

android_runtime

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

androidfw

resolved conflicts for merge of 487ae9b8 to lmp-mr1-dev-plus-aosp

2014-11-07 15:14:02 -08:00

private

Merge "Add kModeSync" into lmp-dev

2014-07-24 20:48:02 +00:00

storage

…