diff options
| author | David Su <dysu@google.com> | 2020-10-07 10:19:36 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-10-07 10:19:36 +0000 |
| commit | 6a1e35bdf223fb2cee9a992170eaddebb14d8e00 (patch) | |
| tree | d92e0bc746ceefa3ce49b7e383cfa52474cec928 /rs/java/android/renderscript/ProgramStore.java | |
| parent | d2ca3eb2f03645b4eead5901cd6cf8adc4bfe9b7 (diff) | |
| parent | 1d9709071dbac83f3cd3ec5efa4652531b78c3d6 (diff) | |
[automerger skipped] Merge "Backport sendBroadcastAsUserMultiplePermissions to oc-dev" into oc-dev am: d1bcf628bd am: 60cf3eebd5 -s ours am: 615d6b6ba6 -s ours am: aeac5e7d30 -s ours am: 5c2b86fbed -s ours am: 4c94806e28 -s ours am: 008d947b59 -s ours am: 81e1bdcb6f -s ours am: 8bb65f94c8 -s ours am: 1d9709071d -s ours
am skip reason: Change-Id I857ea00cc58a0abbb77960643f361dd6dd9c8b56 with SHA-1 e57c25a451 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12724292
Change-Id: I199f532c0d1fed6a733dd7750a8562a9b8c89385
Diffstat (limited to 'rs/java/android/renderscript/ProgramStore.java')
0 files changed, 0 insertions, 0 deletions