Kenny Root e9ae6822a8 resolved conflicts for merge of 1f6e789b to jb-mr2-dev-plus-aosp ...

Change-Id: I06c05d637613215b6d83df3e29cd495f6a5a0176

2013-04-29 23:09:03 -07:00

..

apks

Robustly add symlink and add for non-primary users

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

assets

Phase 2 of test cleanup: moving test files from AndroidTests closer to their sources.

2010-01-29 13:35:51 -08:00

certs

Packages for PackageManagerService tests

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

DisabledTestApp

More framework tests cleanup.

2010-04-01 18:31:11 -07:00

EnabledTestApp

More framework tests cleanup.

2010-04-01 18:31:11 -07:00

res

Handle multi-user mountObb() requests.

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

src

resolved conflicts for merge of 1f6e789b to jb-mr2-dev-plus-aosp

2013-04-29 23:09:03 -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