am 88f295d7: am 6a080bff: Merge "Accounting for widget padding in dips instead...
am 88f295d7: am 6a080bff: Merge "Accounting for widget padding in dips instead of pixels" into jb-dev
* commit '88f295d7':
Accounting for widget padding in dips instead of pixels