commit | 2024651753a83e16920be286314c865eea00eacb | [log] [tgz] |
---|---|---|
author | Dan Albert <danalbert@google.com> | Tue Sep 06 20:00:47 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Sep 06 20:00:47 2016 +0000 |
tree | d1ce39d128b45667c6af72bce5816948b7d78d1d | |
parent | 984490053c6c4dfc9de2db5782a718518b3d7b7e [diff] | |
parent | 0767b6f63cbf305f0d3b9102ed16ad11103f316e [diff] |
Merge "Stop hard coding gmock things." am: 8bc59ec625 am: 0767b6f63c Change-Id: I4754f65d4ef721b5ea8c63f3b1b8c95518877aa2