Merge "Merge "Use LockPatternUtils.resetKeyStore() to clear keystore" into nyc-dev am: fec38d0699 am: cc4e5c5443" into nyc-mr1-dev-plus-aosp

Browse Source

am: 8c346e3ed7

* commit '8c346e3ed7a180d025617e9c670ef3c3d26b807e':

Change-Id: Id86f895120ba6644909910d29fa4bf3ba97ad916

...

This commit is contained in:

Ricky Wai

2016-05-26 14:52:14 +00:00

committed by android-build-merger

parent bc5535d9b2 8c346e3ed7

commit 67c044d5d5

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available