commit | 4a85f36c2ec49308de29a017512fa25222c81eb7 | [log] [tgz] |
---|---|---|
author | Dan Albert <danalbert@google.com> | Fri Aug 12 09:24:57 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Aug 12 09:24:57 2016 +0000 |
tree | 842f141e126a91d7158e54cd00ac019c2ddb8673 | |
parent | 75e79b874e1215a6acf408aef184009136535922 [diff] | |
parent | 632565e26c1a40bdd4e02726798ba86d6f747549 [diff] |
Merge "Stop hard coding gtest/gmock things." am: 9aef6c7d29 am: 37bbf91a24 am: 632565e26c Change-Id: I7d33bbc218469ba70ce68cdca5571018a091fd45