tree a346d411fb11ed01d14d8cc3a0bf2d43f8eab967
parent 48ee82ad5b315c6df3d12d1dd647e83cc4fdb224
parent c41f6ec877309d9c73168ef8cdc277f82eb0d42e
author Robin Lee <rgl@google.com> 1484156458 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1484156461 +0000

Merge changes I3fd28e69,If43820b6

* changes:
  Lock work tasks from SystemUI instead of ActivityStarter
  Bounce work challenge through a WorkLockActivity