| commit | 1d3da8cc16cdd54505f38d3612d4fcc7d2850593 | [log] [tgz] |
|---|---|---|
| author | Ryohei Takeuchi <takeuchi.ryohei@sts-tottori.com> | Thu May 23 00:56:20 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Thu May 23 00:56:20 2019 -0700 |
| tree | 0df590766c4047defee15fc01e439578ddace6a4 | |
| parent | e6934c7b99e039124e27af59e1ed6656234010fe [diff] | |
| parent | 0672baaa95154b5d21c39f54ae6373c4f11e3e36 [diff] |
Merge "Merge "Merge "Merge "[automerger skipped] Merge "RESTRICT AUTOMERGE: testEncryption for device without secure lock screen" into nougat-cts-dev am: b29aa1aaf6 -s ours am: e0a2ff6ca0 -s ours am: c5ff36a5da -s ours am: 7f27517311 -s ours am: 77c7249c6e -s ours am: 0672baaa95 -s ours am skip reason: subject contains skip directive Change-Id: I0b0108b842402fa69088d2d437956e598bd1d341