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:
18f07fd
498f780
)
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 31cd8615b2 -s ours
author
Bill Yi
<byi@google.com>
Fri, 3 Jun 2016 17:23:48 +0000
(17:23 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 3 Jun 2016 17:23:48 +0000
(17:23 +0000)
am:
498f780f42
-s ours
* commit '
498f780f42d39906ef634abada86eb750ce24fbb
':
Import translations. DO NOT MERGE
Change-Id: I337ee1c7c33a89158126caa18813642e954229e5
Trivial merge