diff options
author | Bryan Ferris <bferris@google.com> | 2020-05-05 22:16:12 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-05 22:16:12 +0000 |
commit | 306b8b41925258d3a38269888c1164a8beb82010 (patch) | |
tree | ab82eefe457294f5428ce9c6d3dc570eb7c20f6d /rs/java/android/renderscript/ProgramStore.java | |
parent | ae9fd5426255de08abc9acb3f91988d6b6abab84 (diff) | |
parent | e5f0ec9b2a087c7463c52bebab84a105d74bf005 (diff) |
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Restrict app transition maximum duration" into oc-dev am: 6255311d39 am: e18fd339be am: b1ae5fd443 -s ours am: 2adaef294b -s ours am: e5f0ec9b2a
Change-Id: Ifdb327346f232f9aa8e04a6d96818a9359b1b6a7
Diffstat (limited to 'rs/java/android/renderscript/ProgramStore.java')
0 files changed, 0 insertions, 0 deletions