diff options
author | Selim Cinek <cinek@google.com> | 2019-06-12 13:12:19 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-06-12 13:12:19 -0700 |
commit | d3455f19ff28e87abe13bbe60a905cee76f0765a (patch) | |
tree | 967aed8e20eaf5a4de8367c97601137a7a2cfe16 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 5b13e27fa7c562a1a3a641dc65a6dd5a931e1e79 (diff) | |
parent | 541c6d9e7e3ddac994582caaf5e394d027fb19e6 (diff) |
Merge "Not bypassing the lockscreen anymore when the user has pulled down" into qt-r1-dev
am: 541c6d9e7e
Change-Id: I9aacc80ba09417be0371c9755b195dbcf4c18a7f
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions