diff options
| author | Winson Chiu <chiuwinson@google.com> | 2020-12-08 05:45:24 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-08 05:45:24 +0000 |
| commit | 1ebf250a941968422a22b86f0defd0d13afe9aed (patch) | |
| tree | 0c192d241707e8a224de40cb0bb510a899c1c10c /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 03628f263f04a656ea28600daf10b1a80177552f (diff) | |
| parent | c6053b1b137dee6c2b413d7fa640ca9378027679 (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: c6053b1b13 -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: Ie39199856b8eede0782f3f7d900aaf81ac207d46
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions