| commit | 051555e49e4d95140256fed029b1e89bfa980367 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Tue Sep 22 20:22:34 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 22 20:22:34 2015 +0000 |
| tree | 98509ed57ed5de37df6e0e64ba266e75c156c743 | |
| parent | 98bc555c6f30588777076c4391dc95b0c2b8dc36 [diff] | |
| parent | 7b9674c0d6fba17b1f4d4bdc83933e8ed32416b6 [diff] |
am 7b9674c0: am b078b024: am c369e54a: am 66a3c178: am 4f300dd8: am 307cd547: Merge "fixed mockview" into kitkat-cts-dev automerge: b7a630f -s ours * commit '7b9674c0d6fba17b1f4d4bdc83933e8ed32416b6':