tree 947d9f69416fab869c6adb5b03a75fb3b5330f31
parent fa6938af6c8c242ed54b291a97d3b3aec88ae7ef
parent 65cff6425e09a0217818c4d79c40bf1b2ec2286e
author Winson Chung <winsonc@google.com> 1381273391 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381273391 -0700

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 '65cff6425e09a0217818c4d79c40bf1b2ec2286e':
  Ensuring that the widget drag outline is padded by the default widget padding. (Bug 10881814)