Guang Zhu 01c560f4af Avoid JUnit4 collision in android-support-test, mockito-target ...

Bug: 31072145
Test: make droid checkbuild

Change-Id: I1462b0ba70aa3ede1a5b2ccc407e234dea1eb1b2

2016-08-25 19:37:46 +00:00

..

java

Merge "Refactored whitelist restrict background uids."

2016-08-24 21:38:53 +00:00

jni

DO NOT MERGE ANYWHERE:AudioSystem: Verify audio port array information

2016-08-20 22:52:28 +00:00

res

resolve merge conflicts of eeeebd3 to master

2016-08-24 00:13:36 -07:00

tests

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

2016-08-25 19:37:46 +00:00