OSDN Git Service

Merge "Stop hard coding gtest/gmock things." am: 9aef6c7d29
authorDan Albert <danalbert@google.com>
Fri, 12 Aug 2016 09:21:58 +0000 (09:21 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 12 Aug 2016 09:21:58 +0000 (09:21 +0000)
am: 37bbf91a24

Change-Id: Ib46bf14481699dd5fbef4e5cc933ecdb584cced9


Trivial merge