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)
commit18cae2e2133c5ca4037bc464e7d353b71a521e0f
tree40788d0b0084ce3cbca5c5de6b1be94deaba95a8
parent9cb91ef30186405e3516bf36caf05a2b32ba9611
parentcfd30c5f4339f48cda5747a86f4c60d8c7b44d7c
[automerger skipped] Merge "Make android.test.mock.stubs in Android.bp" am: 5f29cbb53b
am: cfd30c5f43  -s ours

Change-Id: If050bb11934319b44b7513ffcec0d6020edf5571