diff options
| author | Kevin Chyn <kchyn@google.com> | 2017-08-15 19:29:52 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-08-15 19:29:52 +0000 |
| commit | b79536e0a70844f341257191a6a4a6ee1957e88b (patch) | |
| tree | a0e5864744f2004511245eb26f9f0066adadb46c /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | cd42a2d47617c02e44906260b9bfd35eb36e1716 (diff) | |
| parent | 990d25bda02bbc85d999c10db55eeebd85bcc968 (diff) | |
Merge "Only auth via FP when device is locked, when Assistant is on top" into oc-mr1-dev
am: 990d25bda0
Change-Id: Iffeee7386623128a4228cb8efc1d6fe5af19e865
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions