OSDN Git Service

Merge "Stop hard coding gtest things." am: e88f053af9 am: 0b1d39ca63
authorDan Albert <danalbert@google.com>
Fri, 12 Aug 2016 09:32:10 +0000 (09:32 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 12 Aug 2016 09:32:10 +0000 (09:32 +0000)
am: 108cb03410

Change-Id: If4cf9f31c9105c48821977324b0576c55d74b629


Trivial merge