Commit b35ea871 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge changes from topic "am-9865cac6-d659-4110-a02c-514912c328ce" into nyc-mr1-dev 

* changes:
  [automerger skipped] Merge "RESTRICT AUTOMERGE: testEncryption for device without secure lock screen" into nougat-cts-dev am: b29aa1aa -s ours am skip reason: subject contains skip directive skipped: 15ba2c10 skipped: e80f7d44
  [automerger skipped] Merge "RESTRICT AUTOMERGE: testEncryption for device without secure lock screen" into nougat-cts-dev am: b29aa1aa -s ours am skip reason: subject contains skip directive skipped: 15ba2c10
  [automerger skipped] Merge "RESTRICT AUTOMERGE: testEncryption for device without secure lock screen" into nougat-cts-dev am: b29aa1aa -s ours am skip reason: subject contains skip directive
parents 69ab2457 10ddb125
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