diff options
| author | Winson Chiu <chiuwinson@google.com> | 2020-12-08 01:05:43 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-08 01:05:43 +0000 |
| commit | b2d6cd27d016dfb705375937a756054cec34ddb3 (patch) | |
| tree | bb8affcf8621aa477b18a7b352a6c3f33845d6af /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 6ceb56225be26436633359cedf16cd0767327f90 (diff) | |
| parent | 3a3c34ca4d5eabfd45b66a01d93b8b5cfafec333 (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: 3a3c34ca4d -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: Id97343ba1e679f5fc0c668bcb4a81bd976519004
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions