tree 05998f58589e42b509dfe99e565f8443beb0f041
parent 1df9a7cc16a9dd9892b633aad4ec246677d2c6b5
parent 23ace01340906e9615f747b0adeaac4bf7bf1dc2
author Jorim Jaggi <jjaggi@google.com> 1438208049 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438208049 +0000

am 23ace013: Merge "Adjustments for find sensor screen" into mnc-dev

* commit '23ace01340906e9615f747b0adeaac4bf7bf1dc2':
  Adjustments for find sensor screen