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:
9b54572
4a0abee
)
Merge "Import translations. DO NOT MERGE" into oc-dev
author
Bill Yi
<byi@google.com>
Tue, 9 May 2017 21:34:01 +0000
(21:34 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 9 May 2017 21:34:01 +0000
(21:34 +0000)
am:
4a0abee70e
-s ours
Change-Id: Ifc6b44fa916a03435be579d49c56362d4b71f576
Trivial merge