tree c39b74aab18ab302103d72227ee539fe67238cf6
parent 80444bfb55d40cd912ed46270ec070c6a2494c69
parent 0fc56db04fa7dde3150b02862d6a3ab3374d89bc
author Hyunyoung Song <hyunyoungs@google.com> 1434399153 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1434399153 +0000

am 0fc56db0: Merge "Work profile badge alignment b/21336417" into ub-launcher3-burnaby

* commit '0fc56db04fa7dde3150b02862d6a3ab3374d89bc':
  Work profile badge alignment b/21336417