OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 54d5947 f43dd2b)
[automerger skipped] Fix merge problems with cherry-picking "Add notification setting...
authorRaman Tenneti <rtenneti@google.com>
Wed, 20 Feb 2019 17:24:20 +0000 (09:24 -0800)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 20 Feb 2019 17:24:20 +0000 (09:24 -0800)
am: f43dd2bd13 -s ours
am skip reason: change_id I421c7487955ee339f88e3957c973375d0f87e2ff with SHA1 95bd7221f6 is in history

Change-Id: I3659d3c7be000deb90c28967e621ca3a8989374e


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