tree e25dff5fd21097fa62b1a8a3e2525d349cc08d20
parent 285d2b6fb2a031abc5b22e3adf53bc7f89415dda
parent f4421dceb3df1dcc19f75c7e8eddea3b8aa6ca7b
author Winson Chung <winsonc@google.com> 1392410184 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410184 +0000

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 'f4421dceb3df1dcc19f75c7e8eddea3b8aa6ca7b':