Merge "Added protections to RenderScript VTS class teardown."
authorMichael Butler <butlermichael@google.com>
Fri, 14 Jul 2017 22:46:57 +0000 (22:46 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 14 Jul 2017 22:46:57 +0000 (22:46 +0000)
am: 80002c1ff3

Change-Id: I55d1b0432e87068913a0e40cb72717a3a034b1e7


Trivial merge