diff options
| author | Christine Franks <christyfranks@google.com> | 2017-08-09 21:18:27 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-08-09 21:18:27 +0000 |
| commit | a9ba866927c210d64935b8c155f55b5ccddd6f1a (patch) | |
| tree | a50a2b9f72a41d9e1d52ca710005977d038686b2 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | f329707073bfbfca6cc3c88ebf231717b73e117b (diff) | |
| parent | cf86c068d0094f98b61687785fed6a01b5529347 (diff) | |
Merge "Merge "Allow SMS and calling for demo users" into oc-dr1-dev am: 4387d3a523 am: 966f37ae23" into oc-mr1-dev-plus-aosp
am: cf86c068d0
Change-Id: I61c22ce2336a2eb95796ef4f655afae1ea374ebf
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions