tree 6c2de63f315933c8922888e7aa8f4b075a5872f5
parent 9535ed2c6d2f64e9ee6035a195be6b6549213952
parent 4ba19a006912b8ead80d1343f7ebbaa2d9a8c18d
author Paul Duffin <paulduffin@google.com> 1494502285 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1494502285 +0000

Merge "Prepare for removal of junit and android.test classes from Android API (step 1)" into oc-dev-plus-aosp