OSDN Git Service

Merge "Added android.test.mock and android.test.mock.sdk targets" am: 46f8d427c4
authorPaul Duffin <paulduffin@google.com>
Tue, 6 Jun 2017 08:01:41 +0000 (08:01 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 6 Jun 2017 08:01:41 +0000 (08:01 +0000)
am: de30ee2d40

Change-Id: I4f615991b43350df9748d7f05fdcf5501eff135d


Trivial merge