OSDN Git Service
(root)
/
android-x86
/
packages-apps-Settings.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
256f6fb
9840c89
)
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 814fb3b7a1 -s ours
author
Bill Yi
<byi@google.com>
Fri, 8 Dec 2017 06:04:47 +0000
(06:04 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 8 Dec 2017 06:04:47 +0000
(06:04 +0000)
am:
9840c89235
-s ours
Change-Id: If1f0055b82b51ae304b5bacafa95821d8eaa2d07
Trivial merge