tree 23af8044e90b97e22ca2f923ac84de7a575d2f9b
parent cb42fae8a3c0d777479da5648829fbb9bbe39a71
parent fa6f8a76fb582d1629845e0e23d44fc60fedcb2d
author Paul Duffin <paulduffin@google.com> 1494502288 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1494502294 +0000

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