OSDN Git Service

Merge "Do not stop lock task if it is starting background user" into oc-dev
authorTony Mak <tonymak@google.com>
Thu, 6 Apr 2017 13:29:52 +0000 (13:29 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 6 Apr 2017 13:29:52 +0000 (13:29 +0000)
am: 343715b1c1

Change-Id: Icf08aa23cca59f81f8dc3ca7c5f285e23953bb2b


Trivial merge