projects
/
platform
/
upstream
/
VK-GL-CTS.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
86cd16b
b43199c
)
resolve merge conflicts of 3ffc2f2 to master am: f2c82779ae
author
Pyry Haulos
<phaulos@google.com>
Tue, 13 Sep 2016 19:10:00 +0000
(19:10 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 13 Sep 2016 19:10:00 +0000
(19:10 +0000)
am:
b43199cd47
Change-Id: I5524fb9992aacac7b2bb78048f0b1243c5a03bf9
Trivial merge