diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-29 06:36:23 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-09-29 06:36:23 +0000 |
| commit | 6a76694e27e805050fa9cad161b2ed219573fc31 (patch) | |
| tree | 6ea714029296cf60ab1c0fef8719f9c1e307cf47 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 95346be8e93d8b3fb2c08a75a1ffef4e54a18811 (diff) | |
| parent | 3c5a186dbb922e78202829c84fe5b6c2083d25cc (diff) | |
Merge changes from topic "am-93433cfaa1dd459d86d59ba5a0437447" into rvc-d1-dev-plus-aosp
* changes:
Merge "[RESTRICT AUTOMERGE] Revert "Require permission to create trusted displays"" into rvc-dev am: 5c393cb830 am: 2804a393e2
[RESTRICT AUTOMERGE] Revert "Require permission to create trusted displays" am: ae03031efe am: a2049f590a
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions