summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/ProgramFragmentFixedFunction.java
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2019-12-14 00:14:37 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2019-12-14 00:14:37 +0000
commita8ba0caac274649d48ed25d250964c6e77d869a1 (patch)
tree55cde49e8e4cbeabe78813cccf6f1bc12c02abae /rs/java/android/renderscript/ProgramFragmentFixedFunction.java
parent86a8bd01c6febfd33509521ea1a28bc20dee533d (diff)
parentb083edb7adb8e270add775ba0ba34712263d4e6c (diff)
[automerger skipped] Merge "Use TelephonyManager API to check if device is voice capable." am: c5480019ce am: 8bdcb6c2ce am: b083edb7ad -s ours
am skip reason: Change-Id I3f19a65012ea355091bbbf22ee3c11054ed19e37 with SHA-1 5dbecd9db3 is in history Change-Id: I6f64c74d7a9c7c193e37893b595b7c44f264bc50
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions