| commit | 991b8d2f2c37b0a16954289b30648714803c0aae | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Tue Sep 22 21:16:44 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 22 21:16:44 2015 +0000 |
| tree | 4af660acb1f3bfc9054913ee53c86378a0a420c9 | |
| parent | 381901f8bab478d298d8dd827cc9a25a4bd43aa9 [diff] | |
| parent | 4bf61f4605953c6d8e35d1e0f9711ea25df0be21 [diff] |
am 4bf61f46: am ca2600bf: am 3022573e: am a73f9037: am 051555e4: am 7b9674c0: am b078b024: am c369e54a: am 66a3c178: am 4f300dd8: am 307cd547: Merge "fixed mockview" into kitkat-cts-dev automerge: b7a630f -s ours * commit '4bf61f4605953c6d8e35d1e0f9711ea25df0be21':