| commit | f0f71b855065f02b74c264cbe42205ebbe7889c4 | [log] [tgz] |
|---|---|---|
| author | Ryohei Takeuchi <takeuchi.ryohei@sts-tottori.com> | Mon Aug 26 15:51:02 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Aug 26 15:51:02 2019 -0700 |
| tree | e4dd05f2de811443ab1da4f45ee2762858c8096f | |
| parent | b54b8b010ec2c9c633878171ba3144383d4a57da [diff] | |
| parent | 9b101c6b5c91f4b57fa9566305b4177c62e7ca2f [diff] |
Merge "Merge "Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: DirectBootHostTest on the device that doesn't support secure lock screen" into nougat-cts-dev am: 27764a59cb -s ours am: 079ebb8c7e -s ours am: 84a1c051aa -s ours am: 70c8804f62 -s ours am: 9b101c6b5c -s ours am skip reason: subject contains skip directive Change-Id: I0a07d560b8efb3116992d2e8a3cd1727c7e5f6eb