Commit e4063a61 authored by Android Merger's avatar Android Merger Committed by Gerrit Code Review
Browse files

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

Merge "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" into oreo-mr1-cts-dev
parents c418f2ce 52012d59
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