OSDN Git Service

am 678c2e35: Merge change I9ef88863 into eclair
authorMike Lockwood <lockwood@android.com>
Thu, 3 Dec 2009 19:18:48 +0000 (11:18 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 3 Dec 2009 19:18:48 +0000 (11:18 -0800)
Merge commit '678c2e35768a5426b4ad8f67c836008e7751a353' into eclair-mr2

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


Trivial merge