tree 0b760a67593dd8986b5f9eb02329253d80746219
parent 142e49e007a2645e1575587efe4095ae3eb63231
parent fd5e422eb85d0855c3e6500b56fbcb39e93caea5
author Nancy Chen <nancychen@google.com> 1411579099 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411579099 +0000

am fd5e422e: am e2b1f05b: am 4285afce: am 277a3b25: am 2292a202: Merge "Drag and drop for PhoneFavoriteTileView but not when dialpad is open" into lmp-dev

* commit 'fd5e422eb85d0855c3e6500b56fbcb39e93caea5':
  Drag and drop for PhoneFavoriteTileView but not when dialpad is open