diff options
| author | Tim Kilbourn <tkilbourn@google.com> | 2015-07-23 22:12:36 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-23 22:12:36 +0000 |
| commit | 46638832458d14c6f785b58618eba9dfec796412 (patch) | |
| tree | 2c0cfe71cabb273cb3dfe94354b8e791b3132b49 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 54f1db793264192017c588b618c7d4cb311482c0 (diff) | |
| parent | a2bf7616044051769df86cf5f0bb4b21dedd5269 (diff) | |
am a2bf7616: Merge "Add a wm command to dismiss the keyguard." into mnc-dev
* commit 'a2bf7616044051769df86cf5f0bb4b21dedd5269':
Add a wm command to dismiss the keyguard.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions