diff options
| author | Winson Chiu <chiuwinson@google.com> | 2020-12-08 02:27:59 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-08 02:27:59 +0000 |
| commit | eef8137c886aabd7f48c92b11e95eb5dbd4990dc (patch) | |
| tree | bb8affcf8621aa477b18a7b352a6c3f33845d6af /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | da5f3e5ba78f6e3f30e789c7dc24c4ca0b3149e6 (diff) | |
| parent | 467466711f8ea16cbbf9d177e074898ca49c41d0 (diff) | |
[automerger skipped] Merge "Remove updateIntentVerificationStatusAsUser from ResolverActivity" into oc-mr1-dev am: 9109ce178e -s ours am: b2dd5af43b -s ours am: 4f4568795c -s ours am: c141682801 -s ours am: 31ba467a83 -s ours am: b53a4559f7 -s ours am: 204ae74cc1 -s ours am: 467466711f -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/+/12940359
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iabe6f14aeeb1214bf7880ab641e98db3755da5b0
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions