diff options
| author | Winson Chiu <chiuwinson@google.com> | 2020-12-08 02:26:55 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-08 02:26:55 +0000 |
| commit | 3633a4cf2145303f2bcfe16fc724ae88661e31c4 (patch) | |
| tree | bb8affcf8621aa477b18a7b352a6c3f33845d6af /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 407168827f71d6b27048fd61ec34b1f0ec513cf9 (diff) | |
| parent | 34ed5ec7934d1dc807d27f0e923ae3922e814668 (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: 7043a3487e -s ours am: 34ed5ec793 -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/+/12940362
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib4ae461133121c5056ec75ec7864d5beeae49469
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions