commit | 6f612a619de8331210bae6c1c9249c8a26c8af94 | [log] [tgz] |
---|---|---|
author | Prashant Malani <pmalani@google.com> | Fri Jun 26 23:20:06 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 26 23:20:06 2015 +0000 |
tree | 752ca70110bba5d296eaec591db7d9fd3a91fbcb | |
parent | 957e68c0804f702ff03897394b771c0143a21116 [diff] | |
parent | 2e26847865bc388531e6cf6e9fc0acfd56e112d2 [diff] |
am 2e268478: am b29eeb5a: am b3d02465: am 9a3eacbe: Merge "Revert "Always re-establish kernel alarms when considering new alarm set"" into cw-d-mr1-dev * commit '2e26847865bc388531e6cf6e9fc0acfd56e112d2': Revert "Always re-establish kernel alarms when considering new alarm set"