OSDN Git Service

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

Change-Id: I7d33bbc218469ba70ce68cdca5571018a091fd45


Trivial merge