diff options
author | Jeff Brown <jeffbrown@google.com> | 2013-11-08 11:16:17 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-08 11:16:17 -0800 |
commit | eb544c338c39f3e9435ad1098d559b618d287cf2 (patch) | |
tree | 213cadc2f5c9baeb4a3eafb8c4d663ce7806bb38 /graphics/java/android/renderscript/RenderScript.java | |
parent | 913c0e38a1316f4a653563ba401a0095c54b71d0 (diff) | |
parent | ca39478f33977ba6ba278fb9e3913144d7a5d0c2 (diff) |
am ca39478f: am f99b017e: Merge "Allow keyguard dialogs to show on secondary displays." into klp-dev
* commit 'ca39478f33977ba6ba278fb9e3913144d7a5d0c2':
Allow keyguard dialogs to show on secondary displays.
Diffstat (limited to 'graphics/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions