OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8877120 f1530bf)
resolve merge conflicts of 9887f2f50a to lmp-sprout-dev. am: 5a77651489 am: 5946a9b79...
authorRobert Greenwalt <rgreenwalt@google.com>
Fri, 18 Dec 2015 19:36:54 +0000 (19:36 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 18 Dec 2015 19:36:54 +0000 (19:36 +0000)
am: f1530bf3d7

* commit 'f1530bf3d72315256dd7a2c18ba383dc15445b54':
  Protect some new broadcasts.


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help