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:
54ce05d
13e2543
)
Merge "Import translations. DO NOT MERGE" into nyc-dev am: aa56eef3fd -s ours
author
Bill Yi
<byi@google.com>
Tue, 31 May 2016 16:40:18 +0000
(16:40 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 31 May 2016 16:40:18 +0000
(16:40 +0000)
am:
13e25431cd
-s ours
* commit '
13e25431cdd20e05acfa69f26351d86881598619
':
Import translations. DO NOT MERGE
Change-Id: Ibc124314e722d3e5eb327ad65175846ea00220e4
Trivial merge