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)
commit4a85f36c2ec49308de29a017512fa25222c81eb7
tree842f141e126a91d7158e54cd00ac019c2ddb8673
parent75e79b874e1215a6acf408aef184009136535922
parent632565e26c1a40bdd4e02726798ba86d6f747549
Merge "Stop hard coding gtest/gmock things." am: 9aef6c7d29 am: 37bbf91a24
am: 632565e26c

Change-Id: I7d33bbc218469ba70ce68cdca5571018a091fd45