diff options
| author | Jim Miller <jaggies@google.com> | 2016-06-09 01:51:28 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-09 01:51:28 +0000 |
| commit | 2e2d9956861f121291df9af0b49c6013420e43f4 (patch) | |
| tree | 727a6ee9d4545d7d9e37aecd7df4876eb975ec05 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 3b057d64140f9c75643a0d26c5e495df8918f536 (diff) | |
| parent | f716a049d4ab6fb2a049d6e2125dec9cb7eacbfd (diff) | |
Merge \\\"Always re-enable keyguard state when the user switches.\\\" into nyc-dev am: 9e94c455f8 am: 6e5ff1cb99
am: f716a049d4
Change-Id: I0fe6a3fe2e2002c9c89593390aa68348362eb62e
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions