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

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

Merge "Merge "testEncryption for device without secure lock screen" into nougat-cts-dev am: a138b9c5" into nougat-mr1-cts-dev
am: bec9ad25

Change-Id: I49bf8140fc4908e7bb8e6a9f5745993f0fc28720
parents bfc1bc27 bec9ad25
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