am 2aed56ba: am f4530e8b: Merge "Changed the size of MockView according to resolution." into kitkat-cts-dev automerge: 4a53e93  -s ours automerge: a1eb3bf

* commit '2aed56ba3838c680af0b3f4d60e421a54ed61cc6':
  Changed the size of MockView according to resolution.