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:
bc9a02b
a0b096a
)
[automerger skipped] Import translations. DO NOT MERGE am: 0edea4caec -s ours
author
Bill Yi
<byi@google.com>
Mon, 4 Jun 2018 18:24:57 +0000
(11:24 -0700)
committer
android-build-merger
<android-build-merger@google.com>
Mon, 4 Jun 2018 18:24:57 +0000
(11:24 -0700)
am:
a0b096a28f
-s ours
Change-Id: I299c70ab3193e0b3fb751f06a6dc58243bacaef1
Trivial merge