tree cba62d0d64153aa2169651696bc238591341d679
parent b6ad8a47bcf0c092a3753816a10ee6d12c22a993
parent 084b400936571f0ca2596ca71f8b8adaff6624a0
author Winson Chung <winsonc@google.com> 1414085301 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085301 +0000

am 084b4009: am c83923c1: am f4421dce: am 65cff642: am 5376e7a8: Merge "Ensuring that the widget drag outline is padded by the default widget padding. (Bug 10881814)" into jb-ub-now-indigo-rose

* commit '084b400936571f0ca2596ca71f8b8adaff6624a0':