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:
5236bf8
d9bd267
)
[automerger skipped] Import translations. DO NOT MERGE
author
Bill Yi
<byi@google.com>
Mon, 4 Jun 2018 17:12:58 +0000
(10:12 -0700)
committer
android-build-merger
<android-build-merger@google.com>
Mon, 4 Jun 2018 17:12:58 +0000
(10:12 -0700)
am:
d9bd267146
-s ours
Change-Id: I40fc59c193077ee76cf2e1a47e8039ef08df123f
Trivial merge