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

Browse Source

* commit '1f28a6a571a9b4ff78d85e2b62a30d77ce986d7b':
  Tune delivery and batching of alarms

...

This commit is contained in:

Bart Sears

2014-12-12 22:49:43 +00:00

committed by Android Git Automerger

parent e260a358bf 1f28a6a571

commit 10fe046c93

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available