tree 7e18a2341aa74de7ed1ca60ae0aa0dfb871ddc24
parent cf534d55cff405531d1056966b7e5bc5a1f4bdf8
parent 95cabfe7c542c80eb35f33380bfeb4db37e48575
author Michael Butler <butlermichael@google.com> 1489706798 +0000
committer android-build-merger <android-build-merger@google.com> 1489706798 +0000

Merge "RenderScript VTS implementation" am: eb8d93e4b2 am: 58e653f54b
am: 95cabfe7c5

Change-Id: Ida08f3ad52df03d2b0c0006cef77cd492e78f156