tree af5a21ef08d6b384deee3b0e7d113d1c8155ff17
parent 5db5aafc05e8a2fb2b433ebbcbec170a11b8ba3d
parent bd335e5e953725ff59d66c8226e2a8b164b29824
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