Guang Zhu 2705ae35f9 Avoid JUnit4 collision in android-support-test, mockito-target ...

Bug: 31072145
Test: make droid checkbuild

Change-Id: I7f2b13a4c28e51d76313ee3b6d13c904c2925228

2016-08-25 19:43:16 +00:00

..

res

Import translations. DO NOT MERGE

2016-07-20 07:09:37 -07:00

src/com/android/settings

Tests for launch support on default feature

2016-08-22 21:52:46 +00:00

Android.mk

Avoid JUnit4 collision in android-support-test, mockito-target

2016-08-25 19:43:16 +00:00

AndroidManifest.xml

Tests for launch support on default feature

2016-08-22 21:52:46 +00:00