diff options
| author | Ruben Brunk <rubenbrunk@google.com> | 2013-11-06 23:22:54 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-11-06 23:22:55 +0000 |
| commit | e77d2a9c62e747902bc53d40e303214705702b00 (patch) | |
| tree | eb25879667ba724a9fa9425dab1c90e13b7bbc46 /core/java/android | |
| parent | c9d0ee5e8476bbe0d50b726f9cb4cf173d6f6952 (diff) | |
| parent | 21a99ddd9cfd24c205f3483a56d4af5c83cbc6c4 (diff) | |
| download | frameworks_base-e77d2a9c62e747902bc53d40e303214705702b00.zip frameworks_base-e77d2a9c62e747902bc53d40e303214705702b00.tar.gz frameworks_base-e77d2a9c62e747902bc53d40e303214705702b00.tar.bz2 | |
Merge "Disable face unlock when returning from camera." into klp-dev
Diffstat (limited to 'core/java/android')
0 files changed, 0 insertions, 0 deletions