Merge "[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix NullPointerException when mLockPatternUtils is not set." into pi-dev am: f707a9bdf6 -s ours am: c2490f8b7c am: c00b92c040 am: 7b43322c82 -s ours am skip reason: subject contains skip directive"
This commit is contained in:
committed by
Android (Google) Code Review
commit
6c28f1ff6c