tree fb4a2aead0705e26d8a526c54ff1574a324d58e0
parent 374426a588bfffc7d0657bffe05b65660b438007
parent 1008414dc5b2c6c4d1ae7c3b7c18a421cb639ed2
author Paul Duffin <paulduffin@google.com> 1488535408 +0000
committer android-build-merger <android-build-merger@google.com> 1488535408 +0000

Merge "Prepare for removal of junit and android.test classes from Android API (step 1)" am: c9998dc674 am: 23e53aa67d
am: 1008414dc5

Change-Id: I081bae19c04cb4a1fd52eb16f517e80939046db1