summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/Element.java
diff options
context:
space:
mode:
authorMiranda Kephart <mkephart@google.com>2021-03-10 21:59:48 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-03-10 21:59:48 +0000
commitc29882d03aedceccabb35cb78fe6f4f7992e8230 (patch)
tree5ef0549cad19f7ddc205d5d9e9e79a4a65bf0d52 /rs/java/android/renderscript/Element.java
parent41b527fc6c28e208d24a304b77f4df24fbb7d9aa (diff)
parent109f2fdd81882c0d26bdd3794bb7af1d0ca77b89 (diff)
[automerger skipped] Merge "[DO NOT MERGE] Close screenshot process on user switched" into oc-mr1-dev am: 84fcb616be -s ours am: 663162c3b0 -s ours am: 250d08c924 am: 91175a30c6 -s ours am: c202b0836a am: 109f2fdd81 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13420818 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I00d6a9a211b11ca3b3698f289ce712abe04075e4
Diffstat (limited to 'rs/java/android/renderscript/Element.java')
0 files changed, 0 insertions, 0 deletions