diff options
| author | Christine Franks <christyfranks@google.com> | 2017-08-10 00:25:59 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-08-10 00:25:59 +0000 |
| commit | f4b27a26ef2fcd859552342c28bdde3b9289620d (patch) | |
| tree | ccd14a4148bf9cbb87af2a057d359c1c753f6cd0 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | b14cb6dfa2ff4a597a2d66f9ea1b31b3a4aa60d2 (diff) | |
| parent | 61ecfae7af63c8849cf5be195a8a2696828a823b (diff) | |
Merge "Merge "Allow SMS and calling for demo users" into oc-dr1-dev am: 4387d3a523 am: e5bad6eb25" into oc-mr1-dev-plus-aosp
am: 61ecfae7af
Change-Id: I53592fada1fd5a9f0d5833f51f767e151e178825
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions