tree 5fc122441d8217fccce2fb7dc8c8a9d337441b04
parent 8877120173fd62d6701822471f06fe84e992c2ae
parent f1530bf3d72315256dd7a2c18ba383dc15445b54
author Robert Greenwalt <rgreenwalt@google.com> 1450467414 +0000
committer android-build-merger <android-build-merger@google.com> 1450467414 +0000

resolve merge conflicts of 9887f2f50a to lmp-sprout-dev. am: 5a77651489 am: 5946a9b798 am: 2ecc918bd3 am: 81674b1ff5 am: 1e04dfb926 am: 3927089cce
am: f1530bf3d7

* commit 'f1530bf3d72315256dd7a2c18ba383dc15445b54':
  Protect some new broadcasts.