tree 77104658e91a12ad4d3222adc2f4fc8b5a5b0d7e
parent f140e67f59b9249ee8af22c17690c69e275a0301
parent 97622c994c075be6c3b0c10762bc031a06ac15fa
author Andrew Lee <anwlee@google.com> 1431559582 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1431559582 +0000

am 97622c99: am a812d28b: Merge "Move proximity sensor logic into VM fragment." into mnc-dev

* commit '97622c994c075be6c3b0c10762bc031a06ac15fa':
  Move proximity sensor logic into VM fragment.