diff options
| author | Winson Chiu <chiuwinson@google.com> | 2020-12-08 02:08:09 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-08 02:08:09 +0000 |
| commit | 34ed5ec7934d1dc807d27f0e923ae3922e814668 (patch) | |
| tree | 63ad2e0b4fc8d4f46832b94d1426d81e381543a7 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 083df3e4ff79bc3dc3137d32d58cb426b1ceaa47 (diff) | |
| parent | 7043a3487e91eac60aaf0d33e604f5a3582ee54f (diff) | |
[automerger skipped] Merge "Remove updateIntentVerificationStatusAsUser from ResolverActivity" into qt-qpr1-dev am: 643416f8a3 -s ours am: 738a4e26c9 -s ours am: 5f4f719224 -s ours am: 7043a3487e -s ours
am skip reason: Change-Id Iff7f788a83af68c7fbb1c6b9a8be7b47136be2b6 with SHA-1 3ebeb4c490 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12940362
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iae8bfb5561ebc9e7fbe92e8457a353dfa4bd1a42
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions