Commit 9a7eb00a authored by Ryohei Takeuchi's avatar Ryohei Takeuchi Committed by android-build-merger
Browse files

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

Merge "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: 0dd8c457 -s ours
am skip reason: subject contains skip directive

Change-Id: I3e70b51c04c5e4632506319188809ce08e958545
parents ed68dfd3 0dd8c457
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