OSDN Git Service

resolve merge conflicts of 9887f2f50a to lmp-sprout-dev. am: 5a77651489 am: 5946a9b79...
authorRobert Greenwalt <rgreenwalt@google.com>
Fri, 18 Dec 2015 19:17:58 +0000 (19:17 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 18 Dec 2015 19:17:58 +0000 (19:17 +0000)
commit1e04dfb926040a6fad073fca0835777123d155e7
tree86d58723d07ee18e9db265b9fa930f9193fff671
parent4557ef32fe36b6f7ef7918052400d18af51d452f
parent81674b1ff5deedcf2f1a79f07441e506a4f66354
resolve merge conflicts of 9887f2f50a to lmp-sprout-dev. am: 5a77651489 am: 5946a9b798 am: 2ecc918bd3
am: 81674b1ff5

* commit '81674b1ff5deedcf2f1a79f07441e506a4f66354':
  Protect some new broadcasts.