tree 0c35497f66bdc8c41cc5369093b86a4aa1f51e1e
parent 27defa5dd68b8afa199e2f6c9d66e6046cd263db
parent 7e0a403759c401d3b94f4576bca3aa8fb94fe542
author Sunny Goyal <sunnygoyal@google.com> 1437444020 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1437444020 +0000

am 7e0a4037: Merge "Shifting hotseat icons to aling with all-apps icon, if the hotseat size is different from the source device" into ub-launcher3-burnaby

* commit '7e0a403759c401d3b94f4576bca3aa8fb94fe542':
  Shifting hotseat icons to aling with all-apps icon, if the hotseat size is different from the source device