diff options
| author | Kevin Chyn <kchyn@google.com> | 2017-07-26 02:51:47 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-07-26 02:51:47 +0000 |
| commit | adc0e4a988ed83be2e49cd55bc8a6d1ea1a157c3 (patch) | |
| tree | 847fff8f52edfc8abd8cc4c1da8ff9d9e3a396cf /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 6952554dc5054fc81859bc5350558439cbfcdf08 (diff) | |
| parent | a97779fc704ff51571d6bba4ee256df130e0e9da (diff) | |
Merge "Merge "Keyguard should wait before restarting FP auth after successful FP auth" into oc-dr1-dev am: 192e7ccf45 am: af35c76897" into oc-mr1-dev-plus-aosp
am: a97779fc70
Change-Id: I8dae85af4ddb9beb449c94abb8f412d997f6d6bf
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions