diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-02 16:08:47 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-07-02 16:08:47 +0000 |
| commit | 707d7c1b6e73218c443519f7e6e189e80e1c4ec5 (patch) | |
| tree | dd2408942b47b322a239d8d1575058eac4d8a49a /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | dfe55a14c5a5f71a64a62f2d93fe077683c748f7 (diff) | |
| parent | 607c325a58f42b0e53a853669c45140ba75ccd2b (diff) | |
Merge changes from topic "am-baeaceb929f54fadb7e0f91f6489a7ee" into rvc-qpr-dev-plus-aosp
* changes:
Merge "[DO NOT MERGE]Revert "Flip ENABLE_DYNAMIC_PERMISSIONS, attempt #6."" into rvc-dev am: 3d61c82b41 am: 77de09efd5 am: 0979fa6cf1
[DO NOT MERGE]Revert "Flip ENABLE_DYNAMIC_PERMISSIONS, attempt #6." am: a2127eb446 am: da9943ba2d am: 261c1dc4e7
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions