am 0884f940: am 5f0ce8e6: am 5baebca9: 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 '0884f9401c5f955ffb495526cd393f7b59e343c9':
  Revert "Changed the size of MockView according to resolution."