tree e17162ee03ce151d9c54b07d119857c15cc6b163
parent 15996a09a8c205ee16bb41137236a3744cca9abc
parent 1e1728143737f7d550e4d95ac5c4690355c01c52
author Android Build Merger (Role) <android-build-merger@google.com> 1464216463 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1464216463 +0000

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