OSDN Git Service

Merge "Prepare for removal of junit and android.test classes from Android API (step...
authorPaul Duffin <paulduffin@google.com>
Thu, 11 May 2017 12:36:19 +0000 (12:36 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 11 May 2017 12:36:19 +0000 (12:36 +0000)
am: 973e940af5  -s ours

Change-Id: I931f22eecf9185783c5f5be1c9c0f551998e6e2f


Trivial merge