projects
/
platform
/
upstream
/
VK-GL-CTS.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ebcb02c
2d1edbc
)
resolve merge conflicts of ba455914 to master am: 07a7e24da3 am: 218bfe74ff am: e37a7...
author
Pyry Haulos
<phaulos@google.com>
Fri, 20 Jan 2017 20:41:05 +0000
(20:41 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 20 Jan 2017 20:41:05 +0000
(20:41 +0000)
am:
2d1edbcbc6
Change-Id: I204e1fc1e1172b17d92b8bd85a6a30da5b24e12e
Trivial merge