Commit d9fd6adf authored by Paul Crowley's avatar Paul Crowley Committed by android-build-merger
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
am: 28dbbd53

Change-Id: I0ef94997d042b6c10757630d5e400d714ced2ff1
parents fefb71b8 28dbbd53
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