diff options
| author | Nazanin Bakhshi <nazaninb@google.com> | 2019-01-15 10:00:21 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-01-15 10:00:21 -0800 |
| commit | 593739acd117f723bdaa7cac51df923259d3c597 (patch) | |
| tree | 52de47e1351b4337da27947718fad4ededa728dc /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 3a13a85fd4494731270535e5061bf23db97a6983 (diff) | |
| parent | 9439803c8c690aa7fca5e1ff344a3ac8d22e91d2 (diff) | |
[automerger skipped] Merge "add getPreferredDataSubId to SubscriptionManager and rename setPreferredData -> serPreferredDataSubId" am: 396e01a168 am: 242b982b71
am: 9439803c8c -s ours
am skip reason: change_id I67b18f1ef450c3d9e5615b3d2ec8a53a0691d7af with SHA1 6ca46074e1 is in history
Change-Id: Id9535ddd2f9d06bb852e0ddbdf37122f25599ed4
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions