tree f0340be881b54b3748a02915f531fa16157533fe
parent d3b6e2d790f95f2fb3d85f0993b90bb8708a6114
parent 5946a9b798f9a4b0e9eacd2685fc5ec9d6cc9ed6
author Robert Greenwalt <rgreenwalt@google.com> 1450464539 +0000
committer android-build-merger <android-build-merger@google.com> 1450464539 +0000

resolve merge conflicts of 9887f2f50a to lmp-sprout-dev. am: 5a77651489
am: 5946a9b798

* commit '5946a9b798f9a4b0e9eacd2685fc5ec9d6cc9ed6':
  Protect some new broadcasts.