diff options
| author | Winson Chiu <chiuwinson@google.com> | 2020-12-08 01:05:13 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-08 01:05:13 +0000 |
| commit | 3a3c34ca4d5eabfd45b66a01d93b8b5cfafec333 (patch) | |
| tree | dba26e72894220e3ecb4774e09229f4a80840307 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | ac27a5d6f626561ab3b51bead87fc0b605ac6315 (diff) | |
| parent | 31ba467a830209a5bb279935ce14b4511367aaab (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 skip reason: Change-Id Iff7f788a83af68c7fbb1c6b9a8be7b47136be2b6 with SHA-1 2b1ed5b779 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12940359
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic64e32cda798617d69613a3d307ef45cbb9bcbad
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions