| commit | 632565e26c1a40bdd4e02726798ba86d6f747549 | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Fri Aug 12 09:21:58 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Aug 12 09:21:58 2016 +0000 |
| tree | 372d15f916d8abaf87cfece80cfc78858a0fceb2 | |
| parent | 071dce8236f02e22e3e4516684046fc33a16616c [diff] | |
| parent | 37bbf91a2464f680e11e1418e31458e60cb9537a [diff] |
Merge "Stop hard coding gtest/gmock things." am: 9aef6c7d29 am: 37bbf91a24 Change-Id: Ib46bf14481699dd5fbef4e5cc933ecdb584cced9