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:
064c643
e21ab96
)
Merge "Skip track if verification fails" into klp-dev am: ab2c5046ef am: f233415199...
author
Marco Nelissen
<marcone@google.com>
Fri, 4 Aug 2017 23:40:18 +0000
(23:40 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 4 Aug 2017 23:40:18 +0000
(23:40 +0000)
am:
e21ab964c1
-s ours
Change-Id: I00ac4a069a160f16600d081e2be3e97f7513a92f
Trivial merge