diff options
| author | Craig Mautner <cmautner@google.com> | 2014-03-14 22:03:06 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-14 22:03:06 +0000 |
| commit | 17586ce7a60d4f3e71ec34cdb3903a915290e527 (patch) | |
| tree | 17bb9c6fc9b033e20594ec6e6d8d76cec95436ce /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 43bfed5430f8c0b042ad229370a9d1fe95eb6156 (diff) | |
| parent | 5df673d915ef9c9d4466ff1a7eeaf62f908c7aff (diff) | |
am 5df673d9: am f6f0946a: am 00c7d34c: am ff89d589: Merge commit \'3b9de0a4\' into manualmerge
* commit '5df673d915ef9c9d4466ff1a7eeaf62f908c7aff':
Show the keyguard if unsecure window on top
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions