tree 276197f7b2e824c5467294a7dbe90bc9bd9663db
parent 604c29006bb13944ee3ba3b64e5ed149608a4d9a
parent f044e0b87f1407847c48eb2092a0dfaf5f527320
author Pavel Grafov <pgrafov@google.com> 1498080287 +0000
committer android-build-merger <android-build-merger@google.com> 1498080287 +0000

Merge "Provide content description for WorkLockActivity." into oc-dev
am: f044e0b87f

Change-Id: Ib3df83d82eb2646a0f657606e05225250b5db2e5