projects
/
platform
/
upstream
/
VK-GL-CTS.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6140614
ed8e08f
)
resolve merge conflicts of b172f9e to master
author
Pyry Haulos
<phaulos@google.com>
Wed, 14 Sep 2016 20:03:34 +0000
(20:03 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 14 Sep 2016 20:03:34 +0000
(20:03 +0000)
am:
ed8e08ff82
Change-Id: I87eea013265484e330874608de507e8f6c193e02
Trivial merge