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:
d2eb52d
5e3def3
)
[automerger skipped] Import translations. DO NOT MERGE skipped: 0697e9e6d7 skipped...
author
Bill Yi
<byi@google.com>
Sun, 11 Nov 2018 03:41:31 +0000
(19:41 -0800)
committer
android-build-merger
<android-build-merger@google.com>
Sun, 11 Nov 2018 03:41:31 +0000
(19:41 -0800)
am:
5e3def3f70
-s ours
Change-Id: Iab399a5abfc4c27aac2956e4d048ef491bd64a3e
Trivial merge