From: Pavel Grafov <pgrafov@google.com>
Date: Thu, 22 Jun 2017 13:45:52 +0000 (+0000)
Subject: Merge "Provide content description for WorkLockActivity." into oc-dev
X-Git-Tag: android-x86-9.0-r1~813^2~457
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=fcc7a55558;p=android-x86%2Fframeworks-base.git

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

Change-Id: I404ec7b0fa7fecb0e4945beca32c634358e0b33e
---

fcc7a55558b5fda03b6557af104dfe331298ebec