tree 305d1d3573a7a135030094d4a4edc1b0efea7e2f
parent 81babaa318bd004a97a35d7d6d9d57c0b7f75e5f
parent d19ffd4f2ca4130c41dd5f6baddad1830598ecbc
author Prashant Malani <pmalani@google.com> 1434065802 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1434065804 +0000

Merge "DO NOT MERGE ANYWHERE Revert "Always re-establish kernel alarms when considering new alarm set"" into lmp-mr1-modular-dev