Elliott Hughes a7ac8be1f5 am dff4ec87: am e16a21c6: resolved conflicts for merge of 4a59376d to stage-aosp-master ...

* commit 'dff4ec87e7b942b7b4410f639fc74c2cffb386d6':
  Track libcore API change.

2013-07-11 10:16:46 -07:00

..

jni

Add liblog

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

res

Import translations. DO NOT MERGE

2012-06-21 13:15:26 -07:00

src/com/android/defcontainer

am dff4ec87: am e16a21c6: resolved conflicts for merge of 4a59376d to stage-aosp-master

2013-07-11 10:16:46 -07:00

Android.mk

Some system apps are more system than others

2013-06-17 12:47:35 -07:00

AndroidManifest.xml

Improve performance of storage measurement.

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