diff options
| author | Android Build Merger (Role) <android-build-merger@google.com> | 2016-06-09 01:45:00 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-06-09 01:45:01 +0000 |
| commit | 1e197dd9921582e6c05d8698e72c59b435c5210f (patch) | |
| tree | 923a74b01607b1d83f086256b30efa3e9fdca1a3 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | f716a049d4ab6fb2a049d6e2125dec9cb7eacbfd (diff) | |
| parent | 1ae8afa555e293c7dc398e7c3fc32765aff1be1e (diff) | |
Merge "Merge \\"Always re-enable keyguard state when the user switches.\\" into nyc-dev am: 9e94c455f8 am: ff0433c200" into nyc-mr1-dev-plus-aosp
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions