OSDN Git Service

(root) / android-x86 / frameworks-base.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a593801 1a5e879)
resolve merge conflicts of 1a5e87918ebe to oc-mr1-dev-plus-aosp
authorJason Monk <jmonk@google.com>
Tue, 29 Aug 2017 15:30:52 +0000 (11:30 -0400)
committerJason Monk <jmonk@google.com>
Tue, 29 Aug 2017 15:30:52 +0000 (11:30 -0400)
commit826b6094a76efdfa747f477285bc7083bc80c73f
tree50d82c31fff22dd5c3437621d370cfaf038fba3ftree | snapshot
parenta59380177dbfa53614cff1c101f66a21fc9dc9f3commit | diff
parent1a5e87918ebe4419653f3cb93c533af292b20bb7commit | diff
resolve merge conflicts of 1a5e87918ebe to oc-mr1-dev-plus-aosp

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I4d79b74e70e910db662713a2d5ffdcfe287b084f
packages/SystemUI/src/com/android/systemui/qs/QSFooterImpl.java diff1 | | blob | history
frameworks/base
About OSDN
Find Software
Develop Software
Help