| commit | a8cff2acb7cc18d1cf123f45eb4e47e1ab876a20 | [log] [tgz] |
|---|---|---|
| author | Prashant Malani <pmalani@google.com> | Fri Jun 12 16:29:47 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 12 16:29:47 2015 +0000 |
| tree | f705716e5d9a0f5f18844ec4b17e8a1dc7f10852 | |
| parent | 94476be6a4055d09413d51e489446bf220c440a6 [diff] | |
| parent | 327b481f1f2499eaa5ab938e63a2c12c21fe7482 [diff] |
am 327b481f: (-s ours) am 786cd12f: (-s ours) Merge "DO NOT MERGE ANYWHERE Revert "Always re-establish kernel alarms when considering new alarm set"" into lmp-mr1-modular-dev * commit '327b481f1f2499eaa5ab938e63a2c12c21fe7482': DO NOT MERGE ANYWHERE Revert "Always re-establish kernel alarms when considering new alarm set"