tree d702b50bbd0ebcb5a74345a4eb8e40ed136f1c28
parent 3bbc5a113403886b16d276f2438677c5381bfab6
parent c83d3e4b72f8f25bbac39a577f125f0ca04354da
author Dianne Hackborn <hackbod@google.com> 1423164255 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1423164392 +0000

Merge "Always re-establish kernel alarms when considering new alarm set" into lmp-mr1-dev