| commit | 5d8fd70605505a9b0ad504ac869466c8809eef87 | [log] [tgz] |
|---|---|---|
| author | Ryohei Takeuchi <takeuchi.ryohei@sts-tottori.com> | Wed May 22 22:40:36 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Wed May 22 22:40:36 2019 -0700 |
| tree | 281ebb43af6eda6db425aad14ca2632e442222fc | |
| parent | ebe80220aaeeef0ea4fcab875130612200a0e04b [diff] | |
| parent | 7f275173119a470e4b07b7651881740013eebf01 [diff] |
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 skip reason: subject contains skip directive Change-Id: Id34ef87330b8520eede0746fa01a07abb2b3df83