summaryrefslogtreecommitdiffstats
path: root/services/core/java/com/android/server/power/PowerManagerService.java
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2014-02-20 02:23:52 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-02-20 02:23:52 +0000
commitd43ad2f35abcc647f7985abd09ed9de5899faf18 (patch)
tree52bc55b50d91091b53679c83f8b949f217b8df4f /services/core/java/com/android/server/power/PowerManagerService.java
parent4b07b26e8654df52ca80bb2165ebdf9352ab9337 (diff)
parent4c68c4ed463f7f83d05f86ed11046195829028ed (diff)
downloadframeworks_base-d43ad2f35abcc647f7985abd09ed9de5899faf18.zip
frameworks_base-d43ad2f35abcc647f7985abd09ed9de5899faf18.tar.gz
frameworks_base-d43ad2f35abcc647f7985abd09ed9de5899faf18.tar.bz2
am 4c68c4ed: am 24a8e1d0: am af87e19b: Merge "update intent examples for maps bug: 12661490 bug: 12957723" into klp-docs
* commit '4c68c4ed463f7f83d05f86ed11046195829028ed': update intent examples for maps bug: 12661490 bug: 12957723
Diffstat (limited to 'services/core/java/com/android/server/power/PowerManagerService.java')
0 files changed, 0 insertions, 0 deletions