diff options
| author | Winson Chiu <chiuwinson@google.com> | 2020-12-08 05:10:17 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-08 05:10:17 +0000 |
| commit | c6053b1b137dee6c2b413d7fa640ca9378027679 (patch) | |
| tree | 63ad2e0b4fc8d4f46832b94d1426d81e381543a7 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 467466711f8ea16cbbf9d177e074898ca49c41d0 (diff) | |
| parent | 73ba6273638a5d0860fc11407ddb59060ee45827 (diff) | |
[automerger skipped] Merge "Remove updateIntentVerificationStatusAsUser from ResolverActivity" into oc-dev am: e9954e149f am: b070447e39 -s ours am: 2d22fe6eec -s ours am: b8cf8bdb03 -s ours am: 321aaa6e41 -s ours am: 8a7fc10c89 -s ours am: d5b3480c71 -s ours am: 95251a1b76 -s ours am: 73ba627363 -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/+/12940358
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3f2953c21de86611389564340447b443f644e785
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions