tree bd7cf36834b3cf16dc785914014ee27420671b05
parent ed103218edb9bcbbb3094dbb5ba2214eed2341f9
parent 3e169cac13946a663e5a35aa265631aa61dfaf2a
author Bingyu Zhang <bingyuzhang@google.com> 1525199306 -0700
committer android-build-merger <android-build-merger@google.com> 1525199306 -0700

Merge "Accessibility change when Trusted Face icon shows." into pi-dev
am: 3e169cac13

Change-Id: Idc4627e52ab370d1b5f5b5ec2bd6071ab0296e54