tree 2c60ef079432ac77e78d3d3d85413480cb9b298c
parent ec3edb3fcb97a134e48fe3baafd9150adc7696b7
parent dec9c4b4c44b2948748365f117c0b3dcb279fb66
author Stephen Hines <srhines@google.com> 1415233342 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415233342 +0000

am dec9c4b4: am e61edab7: am 878af92f: Merge "Revert "Updated prebuilts for RenderScript compatibility library.""

* commit 'dec9c4b4c44b2948748365f117c0b3dcb279fb66':
  Revert "Updated prebuilts for RenderScript compatibility library."