projects
/
platform
/
upstream
/
VK-GL-CTS.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e4b580a
1f61a3c
)
resolve merge conflicts of 3ffc2f2 to master am: f2c82779ae am: b43199cd47 am: 93119248d0
author
Pyry Haulos
<phaulos@google.com>
Tue, 13 Sep 2016 20:16:08 +0000
(20:16 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 13 Sep 2016 20:16:08 +0000
(20:16 +0000)
am:
1f61a3ca8e
Change-Id: I21523670469267f399b8dd564429db738916b322
Trivial merge