diff options
| author | Winson Chiu <chiuwinson@google.com> | 2020-12-08 02:08:26 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-08 02:08:26 +0000 |
| commit | 8ff268bfc96e70b0e45b0f78b6dc22b300cfb75e (patch) | |
| tree | 63ad2e0b4fc8d4f46832b94d1426d81e381543a7 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 34ed5ec7934d1dc807d27f0e923ae3922e814668 (diff) | |
| parent | 8920e6098efa93160010cfa7a8044ca31e41f027 (diff) | |
[automerger skipped] Merge "Remove updateIntentVerificationStatusAsUser from ResolverActivity" into qt-dev am: a2cee8fb7b -s ours am: fb6579ab0e -s ours am: a92820b434 -s ours am: e4f4a2803c -s ours am: 8920e6098e -s ours
am skip reason: Change-Id Iff7f788a83af68c7fbb1c6b9a8be7b47136be2b6 with SHA-1 ebb4d67258 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12940361
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ifd587b467d2d0c2a1c5929516ee0fcd49e985d19
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions