tree 5e2f8a529be3bd03c79794b86ecca0dcfb4f58ab
parent 6ce27b22ddccf11c3d26fa98d2cb4ab1e4dbe748
parent 39bb0e6ba425705a4a339c965342120ac67a4c24
author Michael Kwan <mkwan@google.com> 1433269759 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1433269759 +0000

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

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