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:
4ad0db1
e948fe0
)
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
author
Bill Yi
<byi@google.com>
Fri, 20 Oct 2017 16:18:33 +0000
(16:18 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 20 Oct 2017 16:18:33 +0000
(16:18 +0000)
am:
e948fe0769
-s ours
Change-Id: I9b23ed7b98821c73269e1f17421e2321c03c3025
Trivial merge