| commit | ea3784db2c8ac1edeeb14e8d9f9b3928cee751a1 | [log] [tgz] |
|---|---|---|
| author | Ryohei Takeuchi <takeuchi.ryohei@sts-tottori.com> | Mon Aug 26 14:16:24 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Aug 26 14:16:24 2019 -0700 |
| tree | edecc03c894f40f85447263086c967c243fcfd9a | |
| parent | 7c27e2dc7483b81fba67dfdac37565f6087fd66b [diff] | |
| parent | e4063a61fe3f312d099a369b5c2c5dc10d296da1 [diff] |
Merge "Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: KeyChainTest for device that don't have Secure Lock Screen" into nougat-cts-dev am: 453f138f95 -s ours am: 6acd335de5 -s ours am: 0dd8c457a6 -s ours am: e4063a61fe -s ours am skip reason: subject contains skip directive Change-Id: Iaa07e3b7b6e39da73129c7cd2348365ce9a96ffa