diff options
| author | Ruben Brunk <rubenbrunk@google.com> | 2013-11-06 15:30:26 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-06 15:30:26 -0800 |
| commit | df049d6f2270b06679d51021c97eb9559f2657b7 (patch) | |
| tree | 60a1a9e82d59602a039671744b98d90af3e5b960 /graphics/java/android/renderscript/RenderScript.java | |
| parent | e5bdd85a99839e1d557c924d5396d510151da42e (diff) | |
| parent | 9aed2ae0bd03edcaef3dd3cac8795055cf8d2b43 (diff) | |
am 9aed2ae0: am e77d2a9c: Merge "Disable face unlock when returning from camera." into klp-dev
* commit '9aed2ae0bd03edcaef3dd3cac8795055cf8d2b43':
Disable face unlock when returning from camera.
Diffstat (limited to 'graphics/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions