diff options
author | Jonathan Scott <scottjonathan@google.com> | 2019-05-20 09:48:28 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-05-20 09:48:28 -0700 |
commit | 1352b54a84051dcda9b00e450cfc24ecc2c03029 (patch) | |
tree | 293f53e6cb420db93e001c508c2e755479036f49 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 9d721b289974b7c85271b371dd1907a25d7a3472 (diff) | |
parent | 3335202167f73fb0fa6d00ee06eb43f659cb6e1c (diff) |
Merge "Whitelist background activity starts from device admin in #sendAdminCommandLocked." into qt-dev
am: 3335202167
Change-Id: Ic73dfece580ac3edc38444cfcc0ad4e5e639ebcd
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions