diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2017-05-12 23:53:56 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-05-12 23:54:11 +0000 |
| commit | 0d11c91d9e77c3222a6fcab5ba95231926ff2145 (patch) | |
| tree | 2af5618439cf9b50b1c37ea9f59a17149a76f8ad /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 05d41a718398239b1e9a2e28ef11c14b66f79adc (diff) | |
| parent | 4b585db64f1dda5c343855e63d7d4b6fc0c6d729 (diff) | |
Merge "AAPT2: Allow <uses-permission-sdk-23> in manifest" into oc-dev
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions