| commit | 1c20d3cf3fe55ebfeb2c4f5cfaff47ed1112e7aa | [log] [tgz] |
|---|---|---|
| author | Dan Sandler <dsandler@android.com> | Fri Mar 06 00:39:10 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 06 00:39:10 2015 +0000 |
| tree | 9dbda8745408b509e7582ee474160e993946b16b | |
| parent | 9488813873735174d762615ea8a78cf60c21c10f [diff] | |
| parent | eef3fbcf6825a5e5e0cb150123d9bc87956fbb23 [diff] |
am eef3fbcf: am 8deb6d95: am e6a4b445: am 3581f4c9: Merge "Avoid crashing on startup when policy forbids lockscreen camera." into lmp-mr1-dev * commit 'eef3fbcf6825a5e5e0cb150123d9bc87956fbb23': Avoid crashing on startup when policy forbids lockscreen camera.