| commit | ef214cb16d262f039cf6d27e9be5bda7d27cafee | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Thu Aug 20 18:04:27 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 20 18:04:27 2015 +0000 |
| tree | effdfc3e21ca4b0c967c02036f07259d16c272d8 | |
| parent | 253932b86542d34c7098d3b32ca6506229b3933e [diff] | |
| parent | 40c1be9326b4e40886bca4857fe9afcad2a4f927 [diff] |
am 40c1be93: Merge "fixed mockview" into kitkat-cts-dev automerge: b7a630f -s ours automerge: 307cd54 * commit '40c1be9326b4e40886bca4857fe9afcad2a4f927': fixed mockview