tree 449ffcd440b5a7472d0bc5090eff937323650af4
parent 56b8c37ebf6e44ebae1c8c4a97af731b90c822a6
parent b91e635fa412e300761e0c1043a60dcbfe96e156
author Adrian Roos <roosa@google.com> 1499359646 +0000
committer android-build-merger <android-build-merger@google.com> 1499359646 +0000

Merge "Merge "LockIcon: Initialize mAccessibilityController" into oc-dr1-dev am: c3fef742c0" into oc-dr1-dev-plus-aosp
am: b91e635fa4

Change-Id: Ic6337edf70a55cc4141dfe70e92565cd73b661d1