summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/ProgramFragmentFixedFunction.java
diff options
context:
space:
mode:
authorHui Yu <huiyu@google.com>2021-01-07 00:24:40 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-01-07 00:24:40 +0000
commitda3fa364cae150e3781c8f72ff071be9375786fa (patch)
treedc2ce6676af80e25b08a562d1a9c995dad0d6756 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java
parent6f4aadc7793ba23876481f1ee3a4405befd70a09 (diff)
parent2005c4ee01ca73988631288f0f8dc2993080b000 (diff)
[automerger skipped] Merge "RESTRICT AUTOMERGE: Set mAllowWhileInUsePermissionInFgs correctly when bindService() from background." into rvc-dev am: 970762d46c am: 2005c4ee01 -s ours
am skip reason: Change-Id I7a240621267648ea54e7dc737ebc55bc665e39b6 with SHA-1 86bd39db35 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13236923 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3c3e570d60cea20eb0bc0700340baa706e14d200
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions