OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 635c2fa 56385ed)
[automerger skipped] Merge "[Settings] Fix conflict of AOSP merge"
authorBonian Chen <bonianchen@google.com>
Fri, 22 Nov 2019 09:13:28 +0000 (01:13 -0800)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 22 Nov 2019 09:13:28 +0000 (01:13 -0800)
am: 56385ed9f8 -s ours
am skip reason: change_id I7a86395c86d31fe2ba54c04ac16b1a0ebfc843f3 with SHA1 c7c84d2c87 is in history

Change-Id: Ifaf20e18a9c5e9e8a890b4d3ffa5040c624dc0dd


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