OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d6f00d8 f8d22de)
resolve merge conflicts of 6e3c86c8ed7a1bcfcbc63bbded0043d4b4efbe10 to stage-aosp...
authorDavid Brazdil <dbrazdil@google.com>
Wed, 11 Jul 2018 12:33:38 +0000 (05:33 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 11 Jul 2018 12:33:38 +0000 (05:33 -0700)
am: f8d22dec87

Change-Id: Ia11c6556d55a1eab3552edcd8665969001cfb9e7


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