tree bc442c8e760233440b09803fca70de054667e00b
parent 7f4335b30a26151b0c0788a5ad57948602fe32f6
parent f25102832029800b77fb4b2d3647255cdbd43bdc
author Michael Butler <butlermichael@google.com> 1491443507 +0000
committer android-build-merger <android-build-merger@google.com> 1491443507 +0000

Merge "Added protections for RenderScript VTS tests." am: 792ec065e0
am: f251028320

Change-Id: I60ad212ce37b90e65ae034e5080cee8bc44e9185