tree 6bcc61b11c6747175408b9d26f20ac463b208891
parent c07da8a29c910d0ab7b1204b1a59bda9117d9d4e
parent 7f1d824daaa742aa9bff52402343f925cbdef44d
author Sunny Goyal <sunnygoyal@google.com> 1431640889 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1431640889 +0000

am 7f1d824d: Merge "Prevent work folder creation when launcher is upgraded." into ub-launcher3-burnaby

* commit '7f1d824daaa742aa9bff52402343f925cbdef44d':
  Prevent work folder creation when launcher is upgraded.