summaryrefslogtreecommitdiffstats
path: root/services/java
diff options
context:
space:
mode:
authorPrashant Malani <pmalani@google.com>2015-06-26 21:12:49 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-06-26 21:12:49 +0000
commitb3d02465f859dbe62b14c787c7de966abd6c7381 (patch)
tree8b6cc9cdc3c475fbba8a90f7c02bfb4b4c1fd4b3 /services/java
parentcf05e31866e94eb9d8a6f0ee1fb9960ba169e2c1 (diff)
parent9a3eacbe9ce0e6a65429c721b6f4e60a28dbdaab (diff)
downloadframeworks_base-b3d02465f859dbe62b14c787c7de966abd6c7381.zip
frameworks_base-b3d02465f859dbe62b14c787c7de966abd6c7381.tar.gz
frameworks_base-b3d02465f859dbe62b14c787c7de966abd6c7381.tar.bz2
am 9a3eacbe: Merge "Revert "Always re-establish kernel alarms when considering new alarm set"" into cw-d-mr1-dev
* commit '9a3eacbe9ce0e6a65429c721b6f4e60a28dbdaab': Revert "Always re-establish kernel alarms when considering new alarm set"
Diffstat (limited to 'services/java')
0 files changed, 0 insertions, 0 deletions