am f74f6f92: am 01eda9fa: am 3d2f94f5: am 8ad223e5: am 8f92e3e6: Merge "Revert "Changed the size of MockView according to resolution."" into kitkat-cts-dev

* commit 'f74f6f92fa546289fca027a0e800d8d49fa1be8a':
  Revert "Changed the size of MockView according to resolution."