am 10fe046c: am 1f28a6a5: resolved conflicts for merge of 08c72334 to lmp-mr1-dev

* commit '10fe046c93324903eea2667dd3ff679930ec997d':
  Tune delivery and batching of alarms
This commit is contained in:
Bart Sears
2014-12-12 22:56:43 +00:00
committed by Android Git Automerger

Diff Content Not Available