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:
a837edb
196c7f7
)
Merge "Import translations. DO NOT MERGE" into nyc-dev
author
Bill Yi
<byi@google.com>
Tue, 5 Apr 2016 03:29:31 +0000
(
03:29
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 5 Apr 2016 03:29:31 +0000
(
03:29
+0000)
am:
196c7f7
-s ours
* commit '
196c7f74dbb1a30bc3898e607f8a70a8233abc65
':
Import translations. DO NOT MERGE
Change-Id: I8b9ce1df4ddebca2b4fa9e66d65d80b280586f14
Trivial merge