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:
2c57ac2
4f9f278
)
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
author
Bill Yi
<byi@google.com>
Thu, 30 Nov 2017 22:49:12 +0000
(22:49 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 30 Nov 2017 22:49:12 +0000
(22:49 +0000)
am:
4f9f278341
-s ours
Change-Id: Ie1b2dd5295272eb2bcc538b7b49fc397a9515ea7
Trivial merge