Dianne Hackborn c32e190ea6 resolved conflicts for merge of a9c38461 to master ...

Change-Id: Ie7044c4f9f15384c3edd328fa8e2932c731d9d5c

2012-06-29 16:23:49 -07:00

..

jni

…

res

Import translations. DO NOT MERGE

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

src/com/android/defcontainer

Fix issue #6761130: Clearing app data in settings does not clear app's USB storage

2012-06-29 15:00:21 -07:00

Android.mk

…

AndroidManifest.xml

…