| commit | 4f300dd82a1613433153f5f151aa00f959b7d6dd | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Tue Sep 22 03:47:10 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 22 03:47:10 2015 +0000 |
| tree | 156bed90a39b671bf500214f92f8bccacf13a478 | |
| parent | 9aa565e2a8c35b8325565dc5df964dba254307fe [diff] | |
| parent | 307cd5473abe9a31577ade05d61b2539e16f0697 [diff] |
am 307cd547: Merge "fixed mockview" into kitkat-cts-dev automerge: b7a630f -s ours * commit '307cd5473abe9a31577ade05d61b2539e16f0697':