| commit | 4bf61f4605953c6d8e35d1e0f9711ea25df0be21 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Tue Sep 22 21:05:48 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 22 21:05:48 2015 +0000 |
| tree | d4d4a0d2c3b83b1a2b958f971208bb87772c72b8 | |
| parent | 7278e93e2b6efe641f43522b3a65f592deabf802 [diff] | |
| parent | ca2600bf8155844529565b12081e1b4cab867750 [diff] |
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 'ca2600bf8155844529565b12081e1b4cab867750':