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

Merge "Merge "Revert "testEncryption for device without secure lock screen""... 

Merge "Merge "Revert "testEncryption for device without secure lock screen"" into nougat-cts-dev am: 6c01bccd" into nougat-mr1-cts-dev
parents bec9ad25 0ba37e08
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