diff options
| author | Winson Chiu <chiuwinson@google.com> | 2020-12-08 02:27:23 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-08 02:27:23 +0000 |
| commit | 7b307e093ffc724eab38f31f5d26e7f00105d2aa (patch) | |
| tree | bb8affcf8621aa477b18a7b352a6c3f33845d6af /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 3633a4cf2145303f2bcfe16fc724ae88661e31c4 (diff) | |
| parent | 8ff268bfc96e70b0e45b0f78b6dc22b300cfb75e (diff) | |
[automerger skipped] Merge "Remove updateIntentVerificationStatusAsUser from ResolverActivity" into qt-dev am: a2cee8fb7b -s ours am: fb6579ab0e -s ours am: a92820b434 -s ours am: e4f4a2803c -s ours am: 8920e6098e -s ours am: 8ff268bfc9 -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/+/12940361
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6f5b9a099277081daaa274fc3783e326fa47e0ad
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions