OSDN Git Service

Merge "Revert "Ensure visible activities when device is unlocked."" into oc-dev
authorWale Ogunwale <ogunwale@google.com>
Thu, 13 Apr 2017 00:48:06 +0000 (00:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 13 Apr 2017 00:48:06 +0000 (00:48 +0000)
commitc1cb7039b12f03b7d8ec0fcae7985dfe20b37036
tree3f6e28e3c9683c5fa0eaae8abda64324a1b65cf7
parenta927a8c3ba5a51637295cc68d716cf408c38091b
parent343cf6e9207291d09e3f023b0cce63ed50f716f7
Merge "Revert "Ensure visible activities when device is unlocked."" into oc-dev
am: 343cf6e920

Change-Id: I05de9ee69443ebcae221736a1d4bcb94b89df00d