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