diff options
| author | Winson Chiu <chiuwinson@google.com> | 2020-12-08 01:04:07 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-08 01:04:07 +0000 |
| commit | 7043a3487e91eac60aaf0d33e604f5a3582ee54f (patch) | |
| tree | d35e61c24159de7b637a231d575953430ea5f80c /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | f3e40ede05f1d9d1e69b911d176dafcf766b526c (diff) | |
| parent | 5f4f7192243a44faf543e7c8a99898afe144959b (diff) | |
[automerger skipped] Merge "Remove updateIntentVerificationStatusAsUser from ResolverActivity" into qt-qpr1-dev am: 643416f8a3 -s ours am: 738a4e26c9 -s ours am: 5f4f719224 -s ours
am skip reason: Change-Id Iff7f788a83af68c7fbb1c6b9a8be7b47136be2b6 with SHA-1 3ebeb4c490 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12940362
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I05cb489b450cfced5aa5efb279b43633fa13e9d5
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions