diff options
| author | Hui Yu <huiyu@google.com> | 2021-08-26 21:44:09 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-26 21:44:09 +0000 |
| commit | 8333d75972584455fb99cb5860b30858933ca695 (patch) | |
| tree | b8f1184ad812fc61065eb1cec0e7b2ca9c133fd9 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 7aaecba06a35f90cf219360b369c47274be129a4 (diff) | |
| parent | 2162cfd39bdef4dd2aa61dc43b6b71e54d46baef (diff) | |
[automerger skipped] Merge "Revert "BG-FGS-start while-in-use permission restriction improve..."" into rvc-dev am: 63bab23a9d am: 2162cfd39b -s ours
am skip reason: Merged-In Idc88f274c7a323d175d65bb47eca041772ae9bb7 with SHA-1 6706c1acc0 is already in history. Merged-In was found from reverted change.
Reverted change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15081994
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15676753
Change-Id: I38ecbed98f34106d874d1f14a4e6750dc78f2072
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions