diff options
author | Nancy Zheng <nzheng@google.com> | 2016-09-29 18:45:37 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-09-29 18:45:37 +0000 |
commit | 261faadbb9273c4ae1773518b78b5f4dea99260f (patch) | |
tree | da09897f44d017f1561597890b4cd9c016da394e /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 3e907fd67c68f3e4844c8d5086f393d1eec0991d (diff) | |
parent | b8ad282092c0c2f73f227eb783ef981f61b3b809 (diff) |
Merge "Do not launch assistant via long press when device is locked." into cw-f-dev am: 2ab563ec6a
am: b8ad282092
Change-Id: Ie42d8d1e7215efbfbb5cdb2569cd5362329b8e2f
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions