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:
f881700
682ff55
)
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
author
Bill Yi
<byi@google.com>
Thu, 17 Aug 2017 15:40:43 +0000
(15:40 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 17 Aug 2017 15:40:43 +0000
(15:40 +0000)
am:
682ff5562c
-s ours
Change-Id: I862ac0ee9e44ab52838a797892d5cfe28a576a15
Trivial merge