commit 03107b4d47ab057c037f97d1be903334ff434de2
author Michael Lentine <mlentine@google.com> Fri Dec 11 10:49:51 2015 -0800
committer Mark Lobodzinski <mark@lunarg.com> Tue Dec 29 17:12:14 2015 -0700
tree ca47f44d49c415350a37e5ce5a3e0864c0a2e6dc
parent 30b673be4ef4e688abd7bbeb7fb12f2db7f9f66d

layers: MR89, Fix gtests for android

Conflicts:
	layers/draw_state.cpp
	layers/image.cpp
	layers/mem_tracker.cpp

layers/apidump.h

diff --git a/layers/apidump.h b/layers/apidump.h
index fb13170..ce49431 100644
--- a/layers/apidump.h
+++ b/layers/apidump.h
@@ -36,7 +36,7 @@
 #define LAYER_PROPS_ARRAY_SIZE 1
 static const VkLayerProperties layerProps[LAYER_PROPS_ARRAY_SIZE] = {
     {
-        "Generic",
+        "VK_LAYER_LUNARG_api_dump",
         VK_API_VERSION,                 // specVersion
         VK_MAKE_VERSION(0, 1, 0),       // implementationVersion
         "layer: APIDump",
@@ -46,7 +46,7 @@
 #define LAYER_DEV_PROPS_ARRAY_SIZE 1
 static const VkLayerProperties layerDevProps[LAYER_DEV_PROPS_ARRAY_SIZE] = {
     {
-        "Generic",
+        "VK_LAYER_LUNARG_api_dump",
         VK_API_VERSION,                 // specVersion
         VK_MAKE_VERSION(0, 1, 0),       // implementationVersion
         "layer: APIDump",