tree ee5421c43ce6260eb2b0eb4d612263fd784fef66
parent 618933504a39857e437aa64ccb201a53f2e48a8f
parent 0c6b03d41b79d28b120df91806dc41f8024fdd40
author Michael Kwan <mkwan@google.com> 1433269133 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1433269133 +0000

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

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