resolve merge conflicts of 5248f97c88 to vulkan.
authorPyry Haulos <phaulos@google.com>
Thu, 21 Jan 2016 17:45:24 +0000 (09:45 -0800)
committerPyry Haulos <phaulos@google.com>
Thu, 21 Jan 2016 17:45:24 +0000 (09:45 -0800)
commitefd631f50d2f4c5f1b70a64f7e04103dc7f39407
tree788989bb01e1275f2d02f6caf80dda05b7e899af
parent6ecaaa45165f45868384a1e10942673180e1e08a
parent5248f97c88278a263c6d2c401bdb8f977e876018
resolve merge conflicts of 5248f97c88 to vulkan.

Change-Id: I9a6f891f8971a3724c9526e613b4271ee7dd0cf3
modules/internal/CMakeLists.txt
modules/internal/ditFrameworkTests.cpp