OSDN Git Service

am ea2cf2f9: Merge "Check for the DEVICE_POWER permission in userActivity." into...
authorJoe Onorato <joeo@android.com>
Wed, 29 Sep 2010 00:22:09 +0000 (17:22 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 29 Sep 2010 00:22:09 +0000 (17:22 -0700)
commit1b82e8a1a256aa050290c4900c5f65247ba4e183
tree98c2aa54138fd908e08466ccfb8567ddb09e10bf
parent06c5679c584afdcaba17fdaecd5eb1fc5ef8547e
parent12fac3a5c9034d11156eb1fb3d4a3d96ead19dab
am ea2cf2f9: Merge "Check for the DEVICE_POWER permission in userActivity." into gingerbread

Merge commit 'ea2cf2f936b03f1720bc43863e41c89ea2a7903a' into gingerbread-plus-aosp

* commit 'ea2cf2f936b03f1720bc43863e41c89ea2a7903a':
  Check for the DEVICE_POWER permission in userActivity.