Merge commit '3d2818d34feab5a62dfb33452f99f2d3ca667cc8' into gingerbread-plus-aosp * commit '3d2818d34feab5a62dfb33452f99f2d3ca667cc8': Remove public resource padding.
Merge commit '3d2818d34feab5a62dfb33452f99f2d3ca667cc8' into gingerbread-plus-aosp * commit '3d2818d34feab5a62dfb33452f99f2d3ca667cc8': Remove public resource padding.