tree 9fd3bd29bb43853a8f60d133a0ccedb52440d38f
parent 628b8f1f5f6d249e2f222602352d14c40d648d97
parent 1e04dfb926040a6fad073fca0835777123d155e7
author Robert Greenwalt <rgreenwalt@google.com> 1450466693 -0800
committer android-build-merger <android-build-merger@google.com> 1450466693 -0800

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

* commit '1e04dfb926040a6fad073fca0835777123d155e7':
  Protect some new broadcasts.