projects
/
platform
/
upstream
/
VK-GL-CTS.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9c9d47f
863b6fc
)
resolve merge conflicts of 037808f59 to oc-mr1-dev
author
Mika Isojärvi
<misojarvi@google.com>
Sat, 23 Sep 2017 00:10:38 +0000
(
00:10
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Sat, 23 Sep 2017 00:10:38 +0000
(
00:10
+0000)
am:
863b6fc0e5
Change-Id: I6e195a2d90507f9d358e3fe3cf50cc78446bfadc
Trivial merge