projects / platform / upstream / VK-GL-CTS.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bdc383d 2239f84)
Merge "DO NOT MERGE Restore accidentally commented line" into marshmallow-cts-dev...
authorDaniel Xie <dxie@google.com>
Mon, 23 Nov 2015 15:52:57 +0000 (15:52 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 23 Nov 2015 15:52:57 +0000 (15:52 +0000)
am: 2239f84a37  -s ours

* commit '2239f84a37e3288e49523e98d5bb964ba62143b6':
  DO NOT MERGE Restore accidentally commented line


Trivial merge
Domain: Graphics System / GL;