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:
da66986
7f1b86e
)
Merge "Import translations. DO NOT MERGE" into nyc-dev
author
Bill Yi
<byi@google.com>
Sat, 7 May 2016 05:30:11 +0000
(
05:30
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Sat, 7 May 2016 05:30:11 +0000
(
05:30
+0000)
am:
7f1b86e5df
-s ours
* commit '
7f1b86e5df66271371cd2e570b5a32c12cde7fee
':
Import translations. DO NOT MERGE
Change-Id: I3ce02f9f42210188d909e48fce22a21ab53ee816
Trivial merge