diff options
| author | Meng Wang <mewan@google.com> | 2019-11-25 16:32:03 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-11-25 16:32:03 -0800 |
| commit | 8d9b14a40de9f0cc2976d739af8e6244824d4773 (patch) | |
| tree | 9d1cd39a1c0acb581fe5c9a11ce2cfac56a87ff8 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 13d940da4d142b744629a728db5f3ee549591a47 (diff) | |
| parent | e5adf943f6f76b3d09d896b1e5c83fdc601b95e7 (diff) | |
[automerger skipped] Merge "Expose API isInEmergencySmsMode" am: afb05a64c1 am: c5634216d7
am: e5adf943f6 -s ours
am skip reason: change_id Ib9c1a4e05f5c8417b93e11cdf6bf81304e57eaec with SHA1 064b674358 is in history
Change-Id: I16744f9adbaa10ab2491f3fd87d803823580497d
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions