summaryrefslogtreecommitdiff
path: root/services/java/com/android/server/PowerManagerService.java
diff options
context:
space:
mode:
authorAmith Yamasani <yamasani@google.com>2012-06-18 16:51:41 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-06-18 16:51:41 -0700
commit39758edbed0be8f3d75427f750db6e9d005cd16a (patch)
tree3a475ef1a8294bf6492d7e4d904149fe0bcd4720 /services/java/com/android/server/PowerManagerService.java
parent56b3a321e7c6f03d1bc0c5c0915d56bc46b7a33e (diff)
parent386ce58a21b81390d2831b0f1107d03773af687a (diff)
am 386ce58a: Merge "Don\'t backup or delete the backup file, if it\'s in the backup path." into jb-dev
* commit '386ce58a21b81390d2831b0f1107d03773af687a': Don't backup or delete the backup file, if it's in the backup path.
Diffstat (limited to 'services/java/com/android/server/PowerManagerService.java')
0 files changed, 0 insertions, 0 deletions