diff options
author | Chen Xu <fionaxu@google.com> | 2019-06-05 11:15:08 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-06-05 11:15:08 -0700 |
commit | e499d9f43cc56dc719e0c490a1c93d3ca0708857 (patch) | |
tree | dbbe47c3809d63d41d2978dd8ee5eec0c0c94817 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
parent | 413fad031f1a61bc76dbbd4021b32b4a72a77561 (diff) | |
parent | 302b8e8cfeeee3efb753cfdaa8e0d1b59cd10ab1 (diff) |
[automerger skipped] Merge "Get the resources associated with subid to support MSIM" am: cdbb700fa3
am: 302b8e8cfe -s ours
am skip reason: change_id Ib00cfe3640b59db5f971c32741eed999131e67c0 with SHA1 ea6d2b1e1e is in history
Change-Id: Ic1d323843fd065b527a70df6ff2fff40beb7a8a4
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions