| commit | 701d8166550e1ddfd62bd82b7ea0f6a91c75a699 | [log] [tgz] |
|---|---|---|
| author | Dan Sandler <dsandler@android.com> | Fri Mar 06 00:10:10 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 06 00:10:10 2015 +0000 |
| tree | 5e14affcc11a3424c275e555fa7c6bfcac15f629 | |
| parent | ac35ad36696bb129aa0de9c9926303ec8b941c9b [diff] | |
| parent | 3581f4c91a77ecb9313f51a2d07ed88ff61d9299 [diff] |
am 3581f4c9: Merge "Avoid crashing on startup when policy forbids lockscreen camera." into lmp-mr1-dev * commit '3581f4c91a77ecb9313f51a2d07ed88ff61d9299': Avoid crashing on startup when policy forbids lockscreen camera.