| commit | eef3fbcf6825a5e5e0cb150123d9bc87956fbb23 | [log] [tgz] |
|---|---|---|
| author | Dan Sandler <dsandler@android.com> | Fri Mar 06 00:31:04 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 06 00:31:04 2015 +0000 |
| tree | fdf536b235334fb660d8e21000288b5a74b13479 | |
| parent | 7a79c4cac3b0c722832e868346db2375b6d6c379 [diff] | |
| parent | 8deb6d95a73d5d6860fbfb2eb273cdbc49c5d2c9 [diff] |
am 8deb6d95: am e6a4b445: am 3581f4c9: Merge "Avoid crashing on startup when policy forbids lockscreen camera." into lmp-mr1-dev * commit '8deb6d95a73d5d6860fbfb2eb273cdbc49c5d2c9': Avoid crashing on startup when policy forbids lockscreen camera.