diff options
author | Jovana Knezevic <jovanak@google.com> | 2019-06-04 18:15:17 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-06-04 18:15:17 -0700 |
commit | 7e80654f564d6364030000c472c68baee9269b59 (patch) | |
tree | 87f027830a609c4fd2c410f058f50e6cd4c450be /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | d562e7511be20d935075f9fc2839d0d0ff617635 (diff) | |
parent | e45e09fceedc8a7785ba226e18854bac4129d0bf (diff) |
Merge "Removing requirement for FEATURE_DEVICE_ADMIN in DPMS.setActivePasswordState()." into qt-dev
am: e45e09fcee
Change-Id: I678920b9b4884ee648dc98e2777f313182df6ddd
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions