diff options
| author | Android Build Merger (Role) <android-build-merger@google.com> | 2017-08-24 22:39:51 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-08-24 22:39:51 +0000 |
| commit | 54c6447f47c212006e3b9d0f72a32246b9260399 (patch) | |
| tree | d88c053db7a99e3ff2e3d4a1addb7a0b5b7a89a7 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | de9e885193ce8004d846c93382ba5a235cb386a4 (diff) | |
| parent | 45629ed19527c2ace3cbe6329f8f3038f9da31bf (diff) | |
Merge changes from topic "am-2cfb180af8604b6fac1598107a7b546e" into oc-mr1-dev-plus-aosp
* changes:
Merge changes from topic "mtp-user" into oc-mr1-dev am: 4de4655f0d
Reset functions to null when user changes. am: e537a83139
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions