diff options
author | Chad Brubaker <cbrubaker@google.com> | 2017-06-21 08:35:11 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-06-21 08:35:11 +0000 |
commit | 2a7f6b8f8483116b94a0c0e7246470dd949ecc22 (patch) | |
tree | e3b168a5c08eeaa00608ed60cdaa817c927d9ad0 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 37bd29af8892fec2b7a11f9475b7221b77320d03 (diff) | |
parent | b4da12905f53a604d1aaf699fb7172e25bca2e7d (diff) |
Merge "Merge "Allow Instant Apps to call getPermissionControllerPackageName" into oc-dev am: 88f98985d5" into oc-dev-plus-aosp
am: b4da12905f
Change-Id: Ida50514aa15a056572fb401ebd4acc5b9e4c13fa
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions