| commit | 918acaf7d018ab11aebc547be422f0765c99202e | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Wed Sep 16 22:50:58 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 16 22:50:58 2015 +0000 |
| tree | dafe0b45d404cac544f0822619ccc73805739a6c | |
| parent | 5041a3b8cab2bbd50b8ef9b954623db20c69c833 [diff] | |
| parent | 4afc710efbf00ae861149c837a6c9f464082df8d [diff] |
am 4afc710e: am d4d9477e: am 4271b94e: am f068eb18: am d8cd984c: am e7a26fd2: (-s ours) am d57eb7c4: am f9a424d9: am b7a630fc: Merge "fixed mockview" into kitkat-cts-dev * commit '4afc710efbf00ae861149c837a6c9f464082df8d':