OSDN Git Service

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

Change-Id: I5bc63733a7373bdfcda14f747c78ba67f7267a9e