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:
c93a998
c76c37e
)
Merge "Import translations. DO NOT MERGE" into nyc-dev
author
Geoff Mendal
<mendal@google.com>
Wed, 9 Mar 2016 16:33:41 +0000
(16:33 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 9 Mar 2016 16:33:41 +0000
(16:33 +0000)
am:
c76c37ef6d
-s ours
* commit '
c76c37ef6dcc19ea956e6130c641017ff4b5eb6f
':
Import translations. DO NOT MERGE
Trivial merge