OSDN Git Service

am e6a4b445: am 3581f4c9: Merge "Avoid crashing on startup when policy forbids locksc...
authorDan Sandler <dsandler@android.com>
Fri, 6 Mar 2015 00:21:47 +0000 (00:21 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 6 Mar 2015 00:21:47 +0000 (00:21 +0000)
commit8deb6d95a73d5d6860fbfb2eb273cdbc49c5d2c9
tree76f79f432089a4a82b6132a5f870d077f8568438
parent6e3c763f0146377f610227c879c8037b1842ab6e
parente6a4b445944489d67d40c8f52322fb149290fcf8
am e6a4b445: am 3581f4c9: Merge "Avoid crashing on startup when policy forbids lockscreen camera." into lmp-mr1-dev

* commit 'e6a4b445944489d67d40c8f52322fb149290fcf8':
  Avoid crashing on startup when policy forbids lockscreen camera.