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:
d155dba
54a7cba
)
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 4f9f278341 ...
author
Bill Yi
<byi@google.com>
Thu, 30 Nov 2017 23:02:50 +0000
(23:02 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 30 Nov 2017 23:02:50 +0000
(23:02 +0000)
am:
54a7cba934
-s ours
Change-Id: I110a38779c30ddccd6edfbda30d7e7ae449b8019
Trivial merge