| commit | 81674b1ff5deedcf2f1a79f07441e506a4f66354 | [log] [tgz] |
|---|---|---|
| author | Robert Greenwalt <rgreenwalt@google.com> | Fri Dec 18 19:04:25 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Dec 18 19:04:25 2015 +0000 |
| tree | 956af5dc2c3a2cd4b789acf774399383bbebc008 | |
| parent | 33c17182058ce0f9d0bae48467827ff52422cdd2 [diff] | |
| parent | 2ecc918bd3c7f63ea70a7395b3a622c7f1a40f84 [diff] |
resolve merge conflicts of 9887f2f50a to lmp-sprout-dev. am: 5a77651489 am: 5946a9b798 am: 2ecc918bd3 * commit '2ecc918bd3c7f63ea70a7395b3a622c7f1a40f84': Protect some new broadcasts.