commit | 5274d3c2eca046fc85f39cccc385750e5178693d | [log] [tgz] |
---|---|---|
author | Daniel Xie <dxie@google.com> | Tue Sep 22 21:15:51 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 22 21:15:51 2015 +0000 |
tree | 4af660acb1f3bfc9054913ee53c86378a0a420c9 | |
parent | 9d027b5b39f381a6719a412215be49a7e78037d6 [diff] | |
parent | cb54f97771537f164f856fa4204ff2cd5bc244fc [diff] |
am cb54f977: am 6acb0b96: am c99bdbc5: am db38d9d9: am af7a9ea8: am 447d7825: am efdfc651: am 88a44614: am b1b162a8: am 8781d0d9: am a1eb3bfe: Merge "Changed the size of MockView according to resolution." into kitkat-cts-dev automerge: 4a53e93 -s ours * commit 'cb54f97771537f164f856fa4204ff2cd5bc244fc':