OSDN Git Service

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

Change-Id: Ied120d80f30e9b81314ad13f6b32450f54f298fa


Trivial merge