tree e4dd05f2de811443ab1da4f45ee2762858c8096f
parent d9accebf4c1f09037e624b1c32f15cf7d52264a7
parent dc58d7adac2bb685de968cfd54b24482e471ab15
author Android Merger <noreply-android-build-merger@google.com> 1566859838 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1566859838 +0000

Merge "Merge "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: be56906a9e -s ours am skip reason: subject contains skip directive"