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

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