| commit | 2ce61fb68a598622343047aa8a202513a61566c2 | [log] [tgz] |
|---|---|---|
| author | Robert Greenwalt <rgreenwalt@google.com> | Fri Dec 18 11:42:58 2015 -0800 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Dec 18 11:42:58 2015 -0800 |
| tree | 21f5a961f37ea240a77fff25ca5191abc9a80448 | |
| parent | 370567d1f5be189c858836746bd93e7482c9571a [diff] | |
| parent | fba515f614c1df7a30f2d003f2861bc14bc8fbda [diff] |
resolve merge conflicts of 9887f2f50a to lmp-sprout-dev. am: 5a77651489 am: 5946a9b798 am: 2ecc918bd3 am: 81674b1ff5 am: 1e04dfb926 am: 3927089cce am: f1530bf3d7 am: fba515f614 * commit 'fba515f614c1df7a30f2d003f2861bc14bc8fbda': Protect some new broadcasts.