diff options
| author | Adrian Roos <roosa@google.com> | 2015-07-17 01:11:37 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-17 01:11:37 +0000 |
| commit | ec7ba2a7a23a74bb14237368d08d523b1dda5fb4 (patch) | |
| tree | 3f6b97bf98887cac58a48070bcdb9dd318d1afe1 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | cb29a8a17a6634ad8b3010bfd4d47eca0f305d96 (diff) | |
| parent | 6893aeee48adc1f8b8aebde5e21b7e1294acfaf2 (diff) | |
am 6893aeee: am 5536bb48: Merge "Fix stuck scrim on keyguard-less devices" into mnc-dev
* commit '6893aeee48adc1f8b8aebde5e21b7e1294acfaf2':
Fix stuck scrim on keyguard-less devices
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions