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

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

[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 skip reason: subject contains skip directive

Change-Id: Ied8fffcc727c09496b4eefdb1f6c5bf8c71d6193
parents 88bc9c6d 453f138f
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