OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 750540a 23a6d1d)
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e am: bebc9f9f3c ...
authorPhil Weaver <pweaver@google.com>
Wed, 12 Jul 2017 23:15:51 +0000 (23:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 12 Jul 2017 23:15:51 +0000 (23:15 +0000)
am: 23a6d1d953  -s ours

Change-Id: Ic4747be59996146ac76509581e390afc99ebe876


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