summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/Script.java
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2019-12-18 16:13:12 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2019-12-18 16:13:12 +0000
commitedd82314a962fccd96981d556994c6e6509afd30 (patch)
tree818a6f067d2abc6580619d86e466ff7b2ad831c0 /rs/java/android/renderscript/Script.java
parent5d14634cb478dc2abe1240a9feda22b46ee44f14 (diff)
parentd7c79c3a2c61f162138632f29be1580d1649cab5 (diff)
[automerger skipped] Merge "Do not restart activity when pinned set changes - just re-sort." into qt-qpr1-dev am: 0416784c2e am: d7c79c3a2c -s ours
am skip reason: Change-Id I6e9e03b77e1486093097ea1488fa589e3c7bd482 with SHA-1 bc29081628 is in history Change-Id: I4065e4068ad0460e95582193893bb09efc49181c
Diffstat (limited to 'rs/java/android/renderscript/Script.java')
0 files changed, 0 insertions, 0 deletions