diff options
| author | Gwen Lin <gwenlin@google.com> | 2020-11-11 03:31:58 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-11 03:31:58 +0000 |
| commit | e239821b13cf727eb0a246f275d2482da1a157ca (patch) | |
| tree | d9cfb7f8f1947741aca5b29a68a394ce715549b6 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | c599432222e6b6280a3ce5b0f6f3e6874ebe047e (diff) | |
| parent | 6ddf53301178615c2cef9883f161aa5cca5828fe (diff) | |
[automerger skipped] Merge "Add KEY_CARRIER_USSD_METHOD_INT to specify methods for USSD requests" am: 3acec4d14f am: ac3167e3dd am: 08ab8031da am: 6ddf533011 -s ours
am skip reason: Change-Id I6a6bfd5e2945ea6aed897896bdbeee244dc0dcc3 with SHA-1 e7145b4eba is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1372476
Change-Id: I9570608b827abecd446828af249ffed1ae50aed5
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions