OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1b84a84
2b92ce7
)
Merge "Import translations. DO NOT MERGE" into nyc-dev
author
Bill Yi
<byi@google.com>
Tue, 7 Jun 2016 03:21:18 +0000
(
03:21
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 7 Jun 2016 03:21:18 +0000
(
03:21
+0000)
am:
2b92ce7aaa
-s ours
* commit '
2b92ce7aaa5a0f22a742cd688488c8b8b05ce82b
':
Import translations. DO NOT MERGE
Change-Id: I058751b2d6f3b01944659df2008956518cbef05b
Trivial merge