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

* commit 'a812d28bfdac171e726d6b865e7ea5cfda24d924':
  Move proximity sensor logic into VM fragment.
tree: 77104658e91a12ad4d3222adc2f4fc8b5a5b0d7e
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags