| commit | 9d2a631bd9fb9d62a7feceda9e3fe22549ddd40c | [log] [tgz] |
|---|---|---|
| author | Prashant Malani <pmalani@google.com> | Fri Jun 26 23:13:02 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 26 23:13:02 2015 +0000 |
| tree | 73901e71a3ddfcf186e51b16c22d160c13f46f57 | |
| parent | a6f022cf4107be0fde10314416be49d5bbf4761e [diff] | |
| parent | 40f8775b60835cdc32c11f13be581c4b2fa73871 [diff] |
am b29eeb5a: am b3d02465: am 9a3eacbe: Merge "Revert "Always re-establish kernel alarms when considering new alarm set"" into cw-d-mr1-dev * commit 'b29eeb5af148097bf55c22a4ce3b040ad2ecc792': Revert "Always re-establish kernel alarms when considering new alarm set"