diff options
| author | Dan Sandler <dsandler@android.com> | 2015-03-06 00:21:47 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-06 00:21:47 +0000 |
| commit | 8deb6d95a73d5d6860fbfb2eb273cdbc49c5d2c9 (patch) | |
| tree | 76f79f432089a4a82b6132a5f870d077f8568438 /rs/java/android/renderscript/RenderScript.java | |
| parent | 6e3c763f0146377f610227c879c8037b1842ab6e (diff) | |
| parent | e6a4b445944489d67d40c8f52322fb149290fcf8 (diff) | |
am e6a4b445: am 3581f4c9: Merge "Avoid crashing on startup when policy forbids lockscreen camera." into lmp-mr1-dev
* commit 'e6a4b445944489d67d40c8f52322fb149290fcf8':
Avoid crashing on startup when policy forbids lockscreen camera.
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions