diff options
| author | Craig Mautner <cmautner@google.com> | 2014-03-07 23:38:20 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-07 23:38:20 +0000 |
| commit | 9bf7f893e0833fca9b240c11b98d6d7dc1892081 (patch) | |
| tree | e0fb0a4728c4487c29c80664a6ac9245dc92b5d4 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | ac87587875f1dfade5e06a82ccc009d0f0170569 (diff) | |
| parent | 93df07a1b72488b64354098cd00dff1d36b76b12 (diff) | |
am 93df07a1: Merge "Show the keyguard if unsecure window on top. DO NOT MERGE." into klp-dev
* commit '93df07a1b72488b64354098cd00dff1d36b76b12':
Show the keyguard if unsecure window on top. DO NOT MERGE.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions