diff options
| author | Winson Chiu <chiuwinson@google.com> | 2020-12-08 02:27:35 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-08 02:27:35 +0000 |
| commit | da5f3e5ba78f6e3f30e789c7dc24c4ca0b3149e6 (patch) | |
| tree | bb8affcf8621aa477b18a7b352a6c3f33845d6af /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 7b307e093ffc724eab38f31f5d26e7f00105d2aa (diff) | |
| parent | b8ac0ebf13b4f1ecb9eb757f0e17b53e9d9473ca (diff) | |
[automerger skipped] Merge "Remove updateIntentVerificationStatusAsUser from ResolverActivity" into pi-dev am: 4837c8a971 -s ours am: 69eed6d337 -s ours am: 8f769e1796 -s ours am: 530654b082 -s ours am: c22f684455 -s ours am: 1c80119aff -s ours am: b8ac0ebf13 -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/+/12940360
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib61021a9d566f530effaaef030e25fa3129da53a
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions