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:
53ff808
4228af9
)
[automerger skipped] Import translations. DO NOT MERGE skipped: faed2889f4 skipped...
author
Bill Yi
<byi@google.com>
Mon, 11 Jun 2018 18:21:05 +0000
(11:21 -0700)
committer
android-build-merger
<android-build-merger@google.com>
Mon, 11 Jun 2018 18:21:05 +0000
(11:21 -0700)
am:
4228af93a7
-s ours
Change-Id: I50958128b0b470ee8d2a3ba83660172f210069c0
Trivial merge