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

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