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