diff options
| author | Jeff Brown <jeffbrown@google.com> | 2013-11-08 11:19:51 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-08 11:19:51 -0800 |
| commit | 776eacc2b9f7c9ce04aef68363d4cd60ac9921c0 (patch) | |
| tree | 323968e9d6b8c4efcb25bd2ace69b74075ebd124 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 5a78dc1cf5b14e4b4c71ce3e743f5a5be8d9de79 (diff) | |
| parent | eb544c338c39f3e9435ad1098d559b618d287cf2 (diff) | |
am eb544c33: am ca39478f: am f99b017e: Merge "Allow keyguard dialogs to show on secondary displays." into klp-dev
* commit 'eb544c338c39f3e9435ad1098d559b618d287cf2':
Allow keyguard dialogs to show on secondary displays.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions