OSDN Git Service

[automerger skipped] Merge "Make android.test.mock.stubs in Android.bp" am: 5f29cbb53b
authorJiyong Park <jiyong@google.com>
Fri, 13 Apr 2018 12:30:44 +0000 (05:30 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 13 Apr 2018 12:30:44 +0000 (05:30 -0700)
am: cfd30c5f43  -s ours

Change-Id: If050bb11934319b44b7513ffcec0d6020edf5571


Trivial merge