diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-02-03 01:07:11 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-02-03 01:07:11 +0000 |
commit | 5382574928c1fdecf2c88799d89bb798ab6d8cd4 (patch) | |
tree | 5ee8b3638cb7afb0bb5769bd08ec7280b681edc0 /rs/java/android/renderscript/RenderScript.java | |
parent | f4a729180c5eae0bb5ebb7f746ff2687cfd2e4ee (diff) | |
parent | 6a5777dd5020378507b97511925a0369f8f408b4 (diff) |
Merge changes from topic "cdm_overlay-oc-mr1-dev" into oc-mr1-dev
* changes:
RESTRICT AUTOMERGE Allow CDM to hide overlays
RESTRICT AUTOMERGE Prevent non-system overlays from showing over CDM UI
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions