tree 5ff9d08eb6ede273524e41207d52ad3e35b34423
parent 428d4847d4ab5ee69f17c69c9b3375fe6d885f50
parent b5ddc22675ac8a41b18d3a1fa09a253082312ab5
author Ricky Wai <rickywai@google.com> 1479433928 +0000
committer android-build-merger <android-build-merger@google.com> 1479433928 +0000

Catch KeyStoreException for setting profile lock am: c8fa5ed8f2 am: 3b546019dc am: c40b9a8ee2
am: b5ddc22675

Change-Id: Idc10bc9e849e4f5d23bba8ee33a7caf72626428b