| commit | b3d02465f859dbe62b14c787c7de966abd6c7381 | [log] [tgz] |
|---|---|---|
| author | Prashant Malani <pmalani@google.com> | Fri Jun 26 21:12:49 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 26 21:12:49 2015 +0000 |
| tree | 8b6cc9cdc3c475fbba8a90f7c02bfb4b4c1fd4b3 | |
| parent | cf05e31866e94eb9d8a6f0ee1fb9960ba169e2c1 [diff] | |
| parent | 9a3eacbe9ce0e6a65429c721b6f4e60a28dbdaab [diff] |
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"