| commit | 82e9dffffbd20fadad50ea9346c26fa6f53d36f8 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Tue Sep 15 20:07:16 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 15 20:07:16 2015 +0000 |
| tree | 6dad61a8948153ccfb2718b48cbb1d70262f4d2d | |
| parent | 6033f21bd5ebde3655da14f5ba333c777aa058f8 [diff] | |
| parent | 3cdef6b94a80122511555f8f08001e904b4b1a9c [diff] |
am 3cdef6b9: am 700c63e8: am dcdff1e4: am f4b129f3: (-s ours) am 5f60500b: am 2ac7db23: am 4a53e934: Merge "Changed the size of MockView according to resolution." into kitkat-cts-dev * commit '3cdef6b94a80122511555f8f08001e904b4b1a9c':