| commit | 4ef4fe51c863935918ac6a62adcb58bae42f50cc | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Thu Aug 20 19:39:04 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 20 19:39:04 2015 +0000 |
| tree | 1f2cad8791a52253e8e4598d97d46bcb8507590e | |
| parent | da491d3905c98866e09e2aec5b1f224bc19d9807 [diff] | |
| parent | 55fabaae2a2f3711a1edd67e06f818ce8b6cb18b [diff] |
am 55fabaae: am 1c19a288: am ef214cb1: am 40c1be93: Merge "fixed mockview" into kitkat-cts-dev automerge: b7a630f -s ours automerge: 307cd54 * commit '55fabaae2a2f3711a1edd67e06f818ce8b6cb18b': fixed mockview