summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/ProgramFragmentFixedFunction.java
diff options
context:
space:
mode:
authorShuo Qian <shuoq@google.com>2020-10-14 19:25:44 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-10-14 19:25:44 +0000
commitbb4f85e004fcec17c71e46745339c3f812ca1b5c (patch)
treea9976f54db52637d2fe9abb777736ef0b4ef4f39 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java
parent1b511ba44210219d5dea4b5f350f7da4b7ae796b (diff)
parentaf6b219d6f3a6a0afb01f9148f70cd62c78bb7b8 (diff)
[automerger skipped] Merge "Use TelephonyManager#isEmergencyNumber() instead" am: 1963c4b1c6 am: e931ca461e am: 4e847577d3 am: af6b219d6f -s ours
am skip reason: Change-Id I232d7f7d23efd963b6d30938f0fa304c90fca8a8 with SHA-1 902b89d936 is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1454556 Change-Id: I449ecf8a716f0677368dc9f146fd279d34c82210
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions