commit 5a995f968ca0e5c9701e36f0240b4708ea69c78d
author Christopher Tate <ctate@google.com> Tue Dec 02 11:48:53 2014 -0800
committer The Android Automerger <android-build@google.com> Thu Dec 11 18:03:19 2014 -0800
tree b1a963a0bebb0e64645d7f660645071636dac675
parent 4f868ed4f5f6da09c5c535a50ef6ab308303e070

Properly recognize repeating wakeup alarms

cherry-pick from lmp-mr1-dev

The code in place was inappropriately treating all recurring alarms
as non-wakeup for purposes of deferral.  Worse, it was overriding the
"this deliverable batch of alarms includes a wakeup alarm" bookkeeping,
so could potentially cause inappropriate deferral of even standalone
wakeup alarms.

Bug 18591317

Change-Id: I2a62ed4badcaeb549c1ac4f086014aa829e45427
(cherry picked from commit 864d42eb96a9127b7d2f10ad11e709c24b4b4304)