commit | e6a4b445944489d67d40c8f52322fb149290fcf8 | [log] [tgz] |
---|---|---|
author | Dan Sandler <dsandler@android.com> | Fri Mar 06 00:10:22 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 06 00:10:22 2015 +0000 |
tree | a65925c1253d48e49bac110b4dabe9ac5034de9e | |
parent | 685e6ce830f97383846335eec758e83ba3ad7060 [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.