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:
15c7ebe
7cea26f
)
[automerger skipped] Import translations. DO NOT MERGE skipped: 0be149db42 skipped...
author
Bill Yi
<byi@google.com>
Tue, 12 Jun 2018 00:22:31 +0000
(17:22 -0700)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 12 Jun 2018 00:22:31 +0000
(17:22 -0700)
am:
7cea26fc9e
-s ours
Change-Id: I1629396b23c0c087402a531095d4c5e5d128c3c0
Trivial merge