OSDN Git Service

Merge "Stop hard coding gtest/gmock things." am: 9aef6c7d29
authorDan Albert <danalbert@google.com>
Fri, 12 Aug 2016 09:21:58 +0000 (09:21 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 12 Aug 2016 09:21:58 +0000 (09:21 +0000)
commit632565e26c1a40bdd4e02726798ba86d6f747549
tree372d15f916d8abaf87cfece80cfc78858a0fceb2
parent071dce8236f02e22e3e4516684046fc33a16616c
parent37bbf91a2464f680e11e1418e31458e60cb9537a
Merge "Stop hard coding gtest/gmock things." am: 9aef6c7d29
am: 37bbf91a24

Change-Id: Ib46bf14481699dd5fbef4e5cc933ecdb584cced9