diff options
| author | Winson Chiu <chiuwinson@google.com> | 2020-12-08 04:47:31 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-08 04:47:31 +0000 |
| commit | 73ba6273638a5d0860fc11407ddb59060ee45827 (patch) | |
| tree | d35e61c24159de7b637a231d575953430ea5f80c /rs/java/android/renderscript/ProgramStore.java | |
| parent | 204ae74cc1a42505154e6019ea9783322a744e7c (diff) | |
| parent | 95251a1b76cbf3f4708e24a7b10184b5040ea090 (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 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: I6f4c9a11af7092177db2a24fc70d423512c30b8d
Diffstat (limited to 'rs/java/android/renderscript/ProgramStore.java')
0 files changed, 0 insertions, 0 deletions