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:
12f5937
b5983ec
)
[automerger skipped] Merge changes into stage-aosp-master
author
chen xu
<fionaxu@google.com>
Mon, 15 Oct 2018 23:12:40 +0000
(16:12 -0700)
committer
android-build-merger
<android-build-merger@google.com>
Mon, 15 Oct 2018 23:12:40 +0000
(16:12 -0700)
am:
b5983ecb29
-s ours
Change-Id: I14f88c998153e945516840acd7d3fbc765dd3357
Trivial merge