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