OSDN Git Service

Merge "Provide content description for WorkLockActivity." into oc-dev
authorPavel Grafov <pgrafov@google.com>
Thu, 22 Jun 2017 13:45:52 +0000 (13:45 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 22 Jun 2017 13:45:52 +0000 (13:45 +0000)
am: f044e0b87f

Change-Id: I404ec7b0fa7fecb0e4945beca32c634358e0b33e


Trivial merge