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:
803f0c9
d172f72
)
Merge "Import translations. DO NOT MERGE" into oc-dev am: 6253e0710b -s ours
author
Bill Yi
<byi@google.com>
Thu, 18 May 2017 20:18:16 +0000
(20:18 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 18 May 2017 20:18:16 +0000
(20:18 +0000)
am:
d172f720d9
-s ours
Change-Id: I6b474c120c59dffeb8b16e565eb47b4c1158fdf2
Trivial merge