summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/ProgramStore.java
diff options
context:
space:
mode:
authorCurtis Belmonte <curtislb@google.com>2020-11-09 23:32:03 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-11-09 23:32:03 +0000
commit4eaf2171706ec3234b7e009fc8af66ce2122bcff (patch)
treeda4cb2ad6c93805a36fe545bcac688babc18c18e /rs/java/android/renderscript/ProgramStore.java
parent7a45c4483391fa0a3662ea7d184bcaba7aa7f2f6 (diff)
parent292c75a05a57b8f2021167ca4ffc165a45e11348 (diff)
[automerger skipped] Merge "DO NOT MERGE Check fingerprint client against top activity in auth callback" into qt-dev am: 5f94201861 -s ours am: e1192c36bb -s ours am: dbf3ed5aa6 -s ours am: 292c75a05a -s ours
am skip reason: Change-Id I9b242a9fee0acbfb430875061e2d809c00fe4b97 with SHA-1 ce0a50bcde is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12755273 Change-Id: Iab3b49ff7034f04b6fe04743ff846529f3af9dda
Diffstat (limited to 'rs/java/android/renderscript/ProgramStore.java')
0 files changed, 0 insertions, 0 deletions