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:
dd11387
cc66c1f
)
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 3496262 -s ours
author
Bill Yi
<byi@google.com>
Mon, 25 Apr 2016 15:21:16 +0000
(15:21 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Mon, 25 Apr 2016 15:21:16 +0000
(15:21 +0000)
am:
cc66c1f
-s ours
* commit '
cc66c1f9911a9cc14179b190e460eff5b94adf15
':
Import translations. DO NOT MERGE
Change-Id: I9c03567a89fd49349a61a8aa1de292a412f10871
Trivial merge