Commit aff03105 authored by Paul Crowley's avatar Paul Crowley Committed by Android (Google) Code Review
Browse files

Merge changes from topic "am-3cdd4c66-50cc-409c-b278-930639c36eae" into oc-dev 

* changes:
  [automerger] RESTRICT AUTOMERGE: testEncryption for device without secure lock screen am: 8b815a30 am: d26558e9 am: 8d57b9c4 am: 75f011eb skipped: c87fe4f5
  [automerger] RESTRICT AUTOMERGE: testEncryption for device without secure lock screen am: 8b815a30 am: d26558e9 am: 8d57b9c4 am: 75f011eb
  [automerger] RESTRICT AUTOMERGE: testEncryption for device without secure lock screen am: 8b815a30 am: d26558e9 am: 8d57b9c4
  [automerger] RESTRICT AUTOMERGE: testEncryption for device without secure lock screen am: 8b815a30 am: d26558e9
  [automerger] RESTRICT AUTOMERGE: testEncryption for device without secure lock screen am: 8b815a30
  RESTRICT AUTOMERGE: testEncryption for device without secure lock screen
parents 060b66e2 0ca629f3
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