Commit 87a2e04c authored by Ryohei Takeuchi's avatar Ryohei Takeuchi Committed by android-build-merger
Browse files

Merge "[automerger skipped] Merge "DO NOT MERGE: KeyChainTest for device that... 

Merge "[automerger skipped] Merge "DO NOT MERGE: KeyChainTest for device that don't have Secure Lock Screen" into nougat-cts-dev am: 453f138f -s ours
am: 6acd335d -s ours
am skip reason: subject contains skip directive

Change-Id: Idccf93da3d1a732551d595f6ff2929e37db5aa12
parents 2ac5958a 6acd335d
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment