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:
442628a
aa56eef
)
Merge "Import translations. DO NOT MERGE" into nyc-dev
author
Bill Yi
<byi@google.com>
Tue, 31 May 2016 16:36:46 +0000
(16:36 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 31 May 2016 16:36:46 +0000
(16:36 +0000)
am:
aa56eef3fd
-s ours
* commit '
aa56eef3fd67e8eb20df96850e0175fb15b3f415
':
Import translations. DO NOT MERGE
Change-Id: I8d141f7bb06750c09b60084105ec51f6aeb244ad
Trivial merge