diff options
| author | Jim Miller <jaggies@google.com> | 2013-11-08 16:31:11 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-08 16:31:11 -0800 |
| commit | a6754bb884accdb5cb80cebb514546d466b360a7 (patch) | |
| tree | 45f5d4da6611cd6974c9fde990a77a86a5d92368 /graphics/java/android/renderscript/RenderScript.java | |
| parent | 4cccc47ce519ba30c14a5b28895f282f864f2900 (diff) | |
| parent | 7aa535a8633ec93426381c68dc061cd951ab5832 (diff) | |
am 7aa535a8: am 01edb226: am ed7376fc: Merge "Restore permission check in keyguard." into klp-dev
* commit '7aa535a8633ec93426381c68dc061cd951ab5832':
Restore permission check in keyguard.
Diffstat (limited to 'graphics/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions