tree cd873dbafd957bc2a2d793353f71fa0e10053b30
parent 2e4f475d1be4aec8c605bdf9b6232149c81b7bba
parent d1eaac2bc02f089f6ec46193f0aa676c15b1a61d
author Michael Kwan <mkwan@google.com> 1433271295 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1433271295 +0000

am d1eaac2b: am 52951f98: am 39bb0e6b: am 0c6b03d4: am 43b1b930: Merge "Added layout tweaks to handle small screens for CTS Sensor Test." into lollipop-mr1-cts-dev

* commit 'd1eaac2bc02f089f6ec46193f0aa676c15b1a61d':
  Added layout tweaks to handle small screens for CTS Sensor Test.