projects
/
platform
/
upstream
/
VK-GL-CTS.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d27ebce
207693d
)
Merge "DO NOT MERGE Restore accidentally commented line" into marshmallow-cts-dev...
author
Daniel Xie
<dxie@google.com>
Mon, 11 Jan 2016 19:54:53 +0000
(19:54 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Mon, 11 Jan 2016 19:54:53 +0000
(19:54 +0000)
am:
207693dbde
-s ours
* commit '
207693dbde69b46c97a410251af33ee4054626c8
':
Trivial merge