| commit | 9071791c35fa2a7a9d1f42d7a292a1f2c7df5e7a | [log] [tgz] |
|---|---|---|
| author | Bart Sears <bsears@google.com> | Fri Dec 12 22:59:05 2014 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Dec 12 22:59:05 2014 +0000 |
| tree | 289469a2e8c25b393592005c3387e07646eb8beb | |
| parent | 7819d9fcf643617812be5e2e6a330f4063b25aaa [diff] | |
| parent | 2648a66bdae6a794f01dceda79fd7f623474c68c [diff] |
am 10fe046c: am 1f28a6a5: resolved conflicts for merge of 08c72334 to lmp-mr1-dev automerge: 2648a66 * commit '2648a66bdae6a794f01dceda79fd7f623474c68c': Tune delivery and batching of alarms