Kenny Root bff405f910 resolved conflicts for merge of d8e8186c to master ...

Change-Id: Ica3f6cd958717ea7033cab8b4bf9cd3425c1e1c5

2010-09-28 18:16:50 -07:00

..

res

Import revised translations.

2010-08-17 16:50:06 -07:00

src/com/android/defcontainer

Update OBB API to include callbacks

2010-09-28 17:23:26 -07:00

Android.mk

AppsOnSd feature - Add default container

2010-01-27 10:26:43 -08:00

AndroidManifest.xml

Include install location preference when installing packages.

2010-02-12 18:50:47 -08:00