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:
665384a
327b911
)
Merge "Import translations. DO NOT MERGE" into oc-dev
author
Bill Yi
<byi@google.com>
Tue, 13 Jun 2017 08:11:23 +0000
(08:11 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 13 Jun 2017 08:11:23 +0000
(08:11 +0000)
am:
327b9119d7
-s ours
Change-Id: I24da3a236478e91b06710a4065ba29663921f940
Trivial merge