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:
8a1d371
edafefc
)
Merge "Import translations. DO NOT MERGE" into nyc-dev
author
Bill Yi
<byi@google.com>
Fri, 3 Jun 2016 22:21:49 +0000
(22:21 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 3 Jun 2016 22:21:49 +0000
(22:21 +0000)
am:
edafefc1ed
-s ours
* commit '
edafefc1edb806b0a4f350b656c4f08f5c3d90e7
':
Import translations. DO NOT MERGE
Change-Id: I61695109d9a89b5e4ab572afc17d773daee9f6d4
Trivial merge