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 21:02:54 +0000 (21:02 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 18 Dec 2015 21:02:54 +0000 (21:02 +0000)
commit4d97265fe8b9b17b2e855ed2da70db8c761959e5
tree9f1d7204b46f17c9461507c6edf2981eea01e8ea
parentfa616e7cab1924dfd82b8c8c7f18c546b02b61d9
parentc57d50c0fbffe2a4f479469b490be751cdcf45fa
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 am: 2ce61fb68a
am: c57d50c0fb

* commit 'c57d50c0fbffe2a4f479469b490be751cdcf45fa':
  Protect some new broadcasts.