OSDN Git Service
(root)
/
android-x86
/
system-bt.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f77868a
ee56071
)
[automerger skipped] resolve merge conflicts of 098e2972201b454de0f95a72636ecd9009dc3...
author
Ugo Yu
<ugoyu@google.com>
Wed, 11 Sep 2019 17:22:19 +0000
(10:22 -0700)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 11 Sep 2019 17:22:19 +0000
(10:22 -0700)
am:
ee56071b66
-s ours
am skip reason: change_id I18b4a1d8e2cdcd6dd4a300f1dc9e6d3892a3baff with SHA1
a65f859b17
is in history
Change-Id: I3c511fd11e78acc9a8ba928ddd0d8a006d2aa20f
Trivial merge