tree b5e662d494fea57e3843927dff1e516b0d8891c8
parent 920503be2fee6f02131d9f3b20e3cc69c5f97c7c
parent 4a9240df07382834e7edaa496d33c85ddbedabab
author Tina Zhou <tinazh@google.com> 1494624574 +0000
committer android-build-merger <android-build-merger@google.com> 1494624574 +0000

Merge "Fix fingerprint-bound key test in work profile" into nougat-cts-dev
am: 4a9240df07

Change-Id: I0643ece792edffc282c22af7ff8ee5a8ef1c9fe2