diff options
| author | Craig Mautner <cmautner@google.com> | 2014-03-08 02:03:00 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-08 02:03:00 +0000 |
| commit | f8c4c3c765ca5d4faa4aed6940e5a26c9c7f1d44 (patch) | |
| tree | f14f56b815bcd0fb6c88c18ee986e3271df33700 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 324aa693b82656809b97e307676adbbce37c3d95 (diff) | |
| parent | 508e88e329cd157c3de94ccbac7374038f7e2355 (diff) | |
am 508e88e3: am 9bf7f893: (-s ours) am 93df07a1: Merge "Show the keyguard if unsecure window on top. DO NOT MERGE." into klp-dev
* commit '508e88e329cd157c3de94ccbac7374038f7e2355':
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