commit | 6acb0b96609ff75b88e6a8feff6b30bab8f7a07e | [log] [tgz] |
---|---|---|
author | Daniel Xie <dxie@google.com> | Tue Sep 22 20:54:01 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 22 20:54:01 2015 +0000 |
tree | 0fe003ba0d24a69430cffa048f11766abc81bc61 | |
parent | a82fbe57c3b6664ee255a255bb46408024467837 [diff] | |
parent | c99bdbc5c10fd6f7123e6fb295fcd2b16c381e6d [diff] |
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 'c99bdbc5c10fd6f7123e6fb295fcd2b16c381e6d':