layers: MR89, Fix gtests for android
authorMichael Lentine <mlentine@google.com>
Fri, 11 Dec 2015 18:49:51 +0000 (10:49 -0800)
committerMark Lobodzinski <mark@lunarg.com>
Wed, 30 Dec 2015 00:12:14 +0000 (17:12 -0700)
commitc68df9cd7c308ea5484b3309e99bd5ad933943c8
tree3b0ec2881e047868eb8b704455b07fdedf817b34
parentfd18d28f99c3b2b8f788a840522c4a9eab03057e
layers: MR89, Fix gtests for android

Conflicts:
layers/draw_state.cpp
layers/image.cpp
layers/mem_tracker.cpp
buildAndroid/jni/Android.mk
buildAndroid/jni/Application.mk
layers/apidump.h
layers/basic.cpp
layers/device_limits.cpp
layers/draw_state.cpp
layers/generic.h
layers/image.cpp
layers/mem_tracker.cpp
layers/swapchain.h
vk-layer-generate.py