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
|
compact
(merge:
94bebd2
11ebb14
)
[automerger skipped] Import translations. DO NOT MERGE
author
Bill Yi
<byi@google.com>
Wed, 11 Jul 2018 17:48:27 +0000
(10:48 -0700)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 11 Jul 2018 17:48:27 +0000
(10:48 -0700)
am:
11ebb14241
-s ours
Change-Id: Idb03e6fbae91f20729a4ebbd504255c99bbba606
Trivial merge