OSDN Git Service

Merge "Add legacy-test as replacement for core-junit" am: e75a82a92f am: a485fa1fce...
authorPaul Duffin <paulduffin@google.com>
Wed, 30 Nov 2016 13:35:15 +0000 (13:35 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 30 Nov 2016 13:35:15 +0000 (13:35 +0000)
am: e34370edfd  -s ours

Change-Id: I0a06fd6b8c7c9c860ecf293728c1c0d887b82358


Trivial merge