OSDN Git Service

(root) / android-x86 / frameworks-base.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 42c18fc 8e4204c)
resolve merge conflicts of 8e4204c8a9a5 to master
authorJason Monk <jmonk@google.com>
Fri, 7 Jul 2017 13:09:59 +0000 (09:09 -0400)
committerJason Monk <jmonk@google.com>
Fri, 7 Jul 2017 13:09:59 +0000 (09:09 -0400)
commit5cdd5d952c555f5ad1b49731bd52d574ebf747a3
treefe6ffee7524c389a8ef9f3258c4932f0b1dc0678tree | snapshot
parent42c18fc2fd88e2c9a1e1df01b2b2ee76731d50bacommit | diff
parent8e4204c8a9a579a18927be9d7fabc2ba91932acdcommit | diff
resolve merge conflicts of 8e4204c8a9a5 to master

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