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:
9ded852
acd97be
)
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
author
Bill Yi
<byi@google.com>
Thu, 20 Jul 2017 21:27:48 +0000
(21:27 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 20 Jul 2017 21:27:48 +0000
(21:27 +0000)
am:
acd97be0b8
-s ours
Change-Id: Ib8a1e9a9f4b4ae2d056b5b4bf8e6603aa9212c4d
Trivial merge