OSDN Git Service

Merge "Provide content description for WorkLockActivity." into oc-dev
authorPavel Grafov <pgrafov@google.com>
Wed, 21 Jun 2017 21:24:47 +0000 (21:24 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 21 Jun 2017 21:24:47 +0000 (21:24 +0000)
am: f044e0b87f

Change-Id: Ib3df83d82eb2646a0f657606e05225250b5db2e5


Trivial merge