tree 1f2d059e9ab46e9d500bda168e65f0e7a0979785
parent 44726df82692b7bb8c3d3f468183fa361b3c93c2
parent a9fce8010def88c637c8de3a3b87a0f5e0c8fadb
author Android Build Merger (Role) <android-build-merger@google.com> 1502297668 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1502297668 +0000

Merge "Merge "LockIcon: update content description when config changes" into oc-dr1-dev am: f79068637a" into oc-mr1-dev