Elliott Hughes a920f25fe5 resolved conflicts for merge of fca0f92e to stage-aosp-master ...

Change-Id: I4791f0ffa324a313b8390fbde6d8f82f716ecf74

2013-06-28 16:41:19 -07:00

..

apks

Robustly add symlink and add for non-primary users

2012-10-18 15:12:09 -07:00

assets

…

certs

Packages for PackageManagerService tests

2012-06-18 14:31:50 -07:00

DisabledTestApp

…

EnabledTestApp

…

res

Handle multi-user mountObb() requests.

2012-09-25 17:34:48 -07:00

src

resolved conflicts for merge of fca0f92e to stage-aosp-master

2013-06-28 16:41:19 -07:00

Android.mk

Track change to JSSE provider

2013-04-29 15:15:27 -07:00

AndroidManifest.xml

Removing duplicated tests that use hidden APIs

2013-01-29 01:38:48 -08:00