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:
4a4b554
9f95053
)
[automerger skipped] Import translations. DO NOT MERGE skipped: cd4aea64f6 skipped...
author
Bill Yi
<byi@google.com>
Fri, 6 Jul 2018 04:11:50 +0000
(21:11 -0700)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 6 Jul 2018 04:11:50 +0000
(21:11 -0700)
am:
9f950537e4
-s ours
Change-Id: I14c71ce82a5d857ef9bdabb7015c582db1dcb3f0
Trivial merge