tree b7c60e43db4b8027efbf6526e1fe17cca7206e89
parent 1d25f8a1cd8b6aa0d095f2c16460472a4477930c
parent b53b22f2426b61583bec44f9bca0ff4d9e73703f
author Miao Wang <miaowang@google.com> 1464216627 +0000
committer android-build-merger <android-build-merger@google.com> 1464216627 +0000

Merge "Merge "[RenderScript] Unhide getByteBuffer and getStride for support lib." into nyc-dev am: 0ed6d7a09c am: 0db4ae8179" into nyc-mr1-dev-plus-aosp
am: bd335e5e95

* commit 'bd335e5e953725ff59d66c8226e2a8b164b29824':

Change-Id: Ie1b68dd8bc006320c8142eb962e6ee006bab6b51