OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 55ba636 c28fb3e)
resolve merge conflicts of 3964c51bf2 to nyc-dev am: 0f04a5a93f am: 8c5c5b5cec am...
authorDmitry Dementyev <dementyev@google.com>
Thu, 9 Mar 2017 18:29:12 +0000 (18:29 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 9 Mar 2017 18:29:12 +0000 (18:29 +0000)
am: c28fb3e071

Change-Id: I1944207165459d9bbd946eb6f30b18809a561c3c


Trivial merge
packages/apps/Settings
About OSDN
Find Software
Develop Software
Help