diff options
| author | Christine Franks <christyfranks@google.com> | 2017-08-09 20:15:33 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-08-09 20:15:33 +0000 |
| commit | 966f37ae239bfcb0864dda826c557047c4061f85 (patch) | |
| tree | f785d540aa310ed81b9e5e930d93f6c2b9e5347a /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 9d836b6312bcea26b1355b4749808ec880e85c08 (diff) | |
| parent | 4387d3a523fde808e6bd9d301102cfb06aea7d87 (diff) | |
Merge "Allow SMS and calling for demo users" into oc-dr1-dev
am: 4387d3a523
Change-Id: I163963c15c009eaf70907203cf941e182409eafc
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions