Elliott Hughes b57dd722f1 resolved conflicts for a884d81e to stage-aosp-master ...

Change-Id: Ice485967fa96f13786024b6939b826638e906ff0

2015-09-24 10:01:32 -07:00

..

apks

resolved conflicts for a884d81e to stage-aosp-master

2015-09-24 10:01:32 -07:00

assets

…

certs

…

DisabledTestApp

…

EnabledTestApp

…

res

Support for nested bundles in setApplicationRestrictions

2015-03-30 17:59:07 -07:00

src

Fix check for caller being the active network scorer

2015-08-06 12:53:59 -07:00

Android.mk

Move apache specific portions of android.net.http to external/apache-http.

2015-02-12 11:15:49 +00:00

AndroidManifest.xml

PhoneWindow ActionMode handling tests

2015-05-14 16:32:32 +01:00