Elliott Hughes d9e6101862 am 05678e17: resolved conflicts for merge of 3ce4f3d0 to master ...

* commit '05678e17e8c079a1c1c144e23e40a7a644a0b040':
  Track libcore.os' move to android.system.

2014-04-28 21:22:01 +00:00

..

jni

Add liblog

2013-04-09 21:54:12 -07:00

res

Import translations. DO NOT MERGE

2014-04-23 12:12:46 -07:00

src/com/android/defcontainer

Track libcore.os' move to android.system.

2014-04-28 11:11:32 -07:00

Android.mk

Use LOCAL_JNI_SHARED_LIBRARIES to install JNI libs.

2014-04-18 16:39:47 -07:00

AndroidManifest.xml

Improve performance of storage measurement.

2013-03-01 16:36:52 -08:00