projects
/
platform
/
upstream
/
VK-GL-CTS.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
cd345ef
f47f5ec
)
resolve merge conflicts of 8afe1d6 to nyc-dev-plus-aosp am: 0d151184d5
author
Pyry Haulos
<phaulos@google.com>
Wed, 14 Sep 2016 19:17:32 +0000
(19:17 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 14 Sep 2016 19:17:32 +0000
(19:17 +0000)
am:
f47f5ecf0b
Change-Id: I8c6b0e792ca70866df83d96a6ce2cd6ef24e1f9f
Trivial merge