OSDN Git Service

Merge "Convert legacy-test, test-runner, and test-mock to Android.bp" am: 9a3132d065...
authorColin Cross <ccross@android.com>
Wed, 13 Dec 2017 02:12:30 +0000 (02:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 13 Dec 2017 02:12:30 +0000 (02:12 +0000)
commit2d4fbeb35af957fd1f55fd2425cf2e048cf716ca
treea185e3862df3120ff3176015aed03795e7f86a0f
parent0962d1603b228094987746d47137515e6ce640c4
parentcfd06fdc146811f861b4bbed09bfef0000da1142
Merge "Convert legacy-test, test-runner, and test-mock to Android.bp" am: 9a3132d065 am: 4b7a6339cf
am: cfd06fdc14  -s ours

Change-Id: I2c773745d1739244839dd86a7c102f2ade3da211