| commit | b6c0ca33d732544decb178c1c447a8660cc550f9 | [log] [tgz] |
|---|---|---|
| author | Prashant Malani <pmalani@google.com> | Fri Jun 26 23:34:32 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 26 23:34:32 2015 +0000 |
| tree | e6983effebf2317bdefc302d34354a11888d25ee | |
| parent | 7b14e3c80ede7e60c833d0d985aa86732eca9d43 [diff] | |
| parent | 6f612a619de8331210bae6c1c9249c8a26c8af94 [diff] |
am 6f612a61: 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 '6f612a619de8331210bae6c1c9249c8a26c8af94': Revert "Always re-establish kernel alarms when considering new alarm set"