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:
1237373
000f97d
)
[automerger skipped] Import translations. DO NOT MERGE
author
Bill Yi
<byi@google.com>
Sun, 5 Aug 2018 01:21:26 +0000
(18:21 -0700)
committer
android-build-merger
<android-build-merger@google.com>
Sun, 5 Aug 2018 01:21:26 +0000
(18:21 -0700)
am:
000f97dcf9
-s ours
Change-Id: Ia6cce5c5529998a45fa52d353f63a8edc8e2c0ef
Trivial merge