tree 55f168cf37781eb42caebea3e21e2b3d59eb0ba8
parent 0bf2f51126a4eda4fd5834af6edaf4481d0dd21a
parent 47eb4efe67479dede028b56a67993c2e4d4922fe
author Winson Chung <winsonc@google.com> 1428357454 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1428357454 +0000

am 47eb4efe: Merge "Ensuring that work-profile applications are mixed in with other apps." into ub-launcher3-burnaby

* commit '47eb4efe67479dede028b56a67993c2e4d4922fe':
  Ensuring that work-profile applications are mixed in with other apps.