commit | 33da5f88d932c457bd7ab6a980814b646cf868ed | [log] [tgz] |
---|---|---|
author | Ryohei Takeuchi <takeuchi.ryohei@sts-tottori.com> | Wed May 22 14:32:54 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Wed May 22 14:32:54 2019 -0700 |
tree | f8e9084af76afb07c53819575f8108f84c5ba252 | |
parent | 66c7c121cf9864b220a21bb461337b9b4b4e342e [diff] | |
parent | d606a8121bad4988af63f1b5af04d0c4566b46ac [diff] |
[automerger skipped] Merge "RESTRICT AUTOMERGE: testEncryption for device without secure lock screen" into nougat-mr1-cts-dev am: d606a8121b -s ours am skip reason: subject contains skip directive Change-Id: I8c412f373420eaf8554019ca082e2efe962858b8