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:
14b9349
d3498e3
)
[automerger skipped] Merge Coral/Flame into AOSP master
author
Xin Li
<delphij@google.com>
Sun, 27 Oct 2019 05:33:13 +0000
(22:33 -0700)
committer
android-build-merger
<android-build-merger@google.com>
Sun, 27 Oct 2019 05:33:13 +0000
(22:33 -0700)
am:
d3498e3053
-s ours
am skip reason: change_id Ibe8ff7bdba7a886bd8b91155ae56f087a836981f with SHA1
af8a6c724f
is in history
Change-Id: I69195e1645a0fd74c3919ab55ff1c171fb51deaf
Trivial merge