OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a0a33d1 47099cf)
Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 4d7111b0e9 ...
authorBill Yi <byi@google.com>
Sat, 22 Jul 2017 16:47:52 +0000 (16:47 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 22 Jul 2017 16:47:52 +0000 (16:47 +0000)
am: 47099cf173  -s ours

Change-Id: I70e2aea1799d8b38baa3a50818ac883b6bf37398


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