OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 17168b7 3a17767)
resolve merge conflicts of 3a1776794a54 to master
authorAdrian Roos <roosa@google.com>
Wed, 5 Apr 2017 20:52:21 +0000 (13:52 -0700)
committerAdrian Roos <roosa@google.com>
Wed, 5 Apr 2017 20:52:27 +0000 (13:52 -0700)
Test: runtest systemui
Change-Id: I711fe627beb95c6e8a089a2118a842f951754abe


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