Paul Duffin 56a2ae1056 Merge "Prepare for removal of legacy-test from default targets" am: c74ccf1588 ...

am: ab62fd67d8

Change-Id: I923de1762a15fca7dc255f9dfe0ecce6f54d333c

2017-01-19 11:44:56 +00:00

..

res

Merge remote-tracking branch 'goog/cw-f-dev' into fix_merger

2016-11-22 17:19:45 -08:00

src/com/android/shell

DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"

2017-01-18 19:33:22 +00:00

tests

Prepare for removal of legacy-test from default targets

2017-01-19 09:43:05 +00:00

Android.mk

Configure code coverage filters.

2016-08-25 17:28:03 -07:00

AndroidManifest.xml

Allow shell to acquire wakelock.

2016-09-13 16:28:45 -07:00