tree 09dd4bf4d772fd851559fb7c9ddccab72ac4126c
parent e006e4d2c91c50795df0a02366b31610b4e97cb1
parent 4da4827504df019d4e64dd864f70526ff6d384a0
author Mike Lockwood <lockwood@android.com> 1285730155 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1285730155 -0700

Merge "Revert "Check for the DEVICE_POWER permission in userActivity."" into gingerbread