| commit | 2648a66bdae6a794f01dceda79fd7f623474c68c | [log] [tgz] |
|---|---|---|
| author | Bart Sears <bsears@google.com> | Fri Dec 12 22:56:43 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Dec 12 22:56:43 2014 +0000 |
| tree | 86ad894933e09470e97d26c06ee22c12db24ea94 | |
| parent | 75070f2f18bbbaa8065000684da64359d8545de9 [diff] | |
| parent | 10fe046c93324903eea2667dd3ff679930ec997d [diff] |
am 10fe046c: am 1f28a6a5: resolved conflicts for merge of 08c72334 to lmp-mr1-dev * commit '10fe046c93324903eea2667dd3ff679930ec997d': Tune delivery and batching of alarms