Adam Lesinski 11bdd5b10b Merge commit '06d8b7b8' into manualmerge ...

Conflicts:
	core/jni/android_util_AssetManager.cpp

Change-Id: I77b72d0d3ec8184ccd97419e4c76b7d55b1a52ca

2014-11-17 12:17:16 -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

Merge commit '06d8b7b8' into manualmerge

2014-11-17 12:17:16 -08:00

private

Merge "Add kModeSync" into lmp-dev

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

storage

…