Narayan Kamath d11f223c53 resolved conflicts for merge of 286a247e to master ...

Change-Id: I63df9d482da3ce2ac851959223b9180020ffad0c

2014-04-10 10:38:31 +01:00

..

jni

Add liblog

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

res

Remove deprecated locales

2013-12-09 22:41:12 +00:00

src/com/android/defcontainer

Re-implement native library search and copies.

2014-04-09 17:16:40 +01: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