OSDN Git Service
(root)
/
android-x86
/
frameworks-av.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
58db801
920df6c
)
Merge "Skip track if verification fails" into klp-dev am: ab2c5046ef am: f233415199...
author
Marco Nelissen
<marcone@google.com>
Fri, 4 Aug 2017 23:34:15 +0000
(23:34 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 4 Aug 2017 23:34:15 +0000
(23:34 +0000)
am:
920df6ca00
-s ours
Change-Id: Ic6d99e347dc5e7230827b9aa0a360e23c17ab881
Trivial merge