tree 3751e44af0b2cfc14a1c92132597c4e016557345
parent 8f1fec3dd21d01ca8e6153df4827f76281f10133
parent 18c8690b7e6ee63e72c781b293822cf1d1d629ce
author Ricky Wai <rickywai@google.com> 1465397207 +0000
committer android-build-merger <android-build-merger@google.com> 1465397207 +0000

Merge \"Make Settings->Apps can handle work apps even work profile not enabled yet\" into nyc-dev
am: 18c8690b7e

Change-Id: I8daa485fcf810c5c5bb40903216f8b989658b5ca