OSDN Git Service

am 44000eb2: am 678c2e35: Merge change I9ef88863 into eclair
authorMike Lockwood <lockwood@android.com>
Fri, 4 Dec 2009 00:33:14 +0000 (16:33 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 4 Dec 2009 00:33:14 +0000 (16:33 -0800)
commit20e7c267c8f8d2de8f121bbf20f5d34487f17997
tree41d379d190b22b433cd57853486cfa6539060c67
parent29d503c6cc9df7882859c689d23609a543b24d8a
parent44000eb2a2340b1a47eaa587d4829810e04cbcdc
am 44000eb2: am 678c2e35: Merge change I9ef88863 into eclair

Merge commit '44000eb2a2340b1a47eaa587d4829810e04cbcdc' into eclair-mr2-plus-aosp

* commit '44000eb2a2340b1a47eaa587d4829810e04cbcdc':
  Add WindowManagerPolicy.OFF_BECAUSE_OF_PROX_SENSOR to indicate screen was turned off by the proximity sensor.