am f5bdeba1: am ea2cf2f9: Merge "Check for the DEVICE_POWER permission in userActivity." into gingerbread
Merge commit 'f5bdeba197aba659e2dd3849a5bdfba8826c036d' * commit 'f5bdeba197aba659e2dd3849a5bdfba8826c036d': Check for the DEVICE_POWER permission in userActivity.
This commit is contained in:
commit
d75675da3f