projects
/
platform
/
upstream
/
VK-GL-CTS.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c5237d7
c4598ea
)
resolve merge conflicts of e5f7483 to master
author
Pyry Haulos
<phaulos@google.com>
Wed, 19 Oct 2016 19:16:03 +0000
(19:16 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 19 Oct 2016 19:16:03 +0000
(19:16 +0000)
am:
c4598ea31b
Change-Id: I61aa10b24cfc71434506c5a83816ce42225b58fd
Trivial merge