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