diff options
author | Winson Chiu <chiuwinson@google.com> | 2020-12-08 02:26:39 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-08 02:26:39 +0000 |
commit | 407168827f71d6b27048fd61ec34b1f0ec513cf9 (patch) | |
tree | bb8affcf8621aa477b18a7b352a6c3f33845d6af /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | b2d6cd27d016dfb705375937a756054cec34ddb3 (diff) | |
parent | 083df3e4ff79bc3dc3137d32d58cb426b1ceaa47 (diff) |
[automerger skipped] Merge "Remove updateIntentVerificationStatusAsUser from ResolverActivity" into rvc-dev am: ca2d8ec7b9 am: 90cd62298f -s ours am: f3e40ede05 -s ours am: 083df3e4ff -s ours
am skip reason: Change-Id Iff7f788a83af68c7fbb1c6b9a8be7b47136be2b6 with SHA-1 4e71b31e0c is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12940363
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I42c230b60abf5cbb5bb10a744c8a840bf02010f3
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions