Merge "Fix issues in memory tests." into vulkan
authorMika Isojarvi <misojarvi@google.com>
Thu, 7 Jan 2016 17:37:18 +0000 (17:37 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 7 Jan 2016 17:37:18 +0000 (17:37 +0000)

Trivial merge