tree fe4b09379835b098068bcdd4ccb6865e213b28ad
parent 8466b0179ec03c4f59981fec7714e3eb64a71453
parent f79068637abadb12fe61b13bfb4b3951d2befaba
author Adrian Roos <roosa@google.com> 1502297476 +0000
committer android-build-merger <android-build-merger@google.com> 1502297476 +0000

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

Change-Id: I81db081bbc793246ed0e6b7fa2551512c9758ff0