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':