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

..

jni

…

res

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

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

src/com/android/mtp

DO NOT MERGE: Fix NullPointerException in MtpManager.

2016-10-18 14:42:28 +09:00

tests

Prepare for removal of legacy-test from default targets

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

Android.mk

…

AndroidManifest.xml

…

proguard.flags

…