Merge commit '3f2c70fb9e2dd503f96958db501729a20bb33c31' into eclair-plus-aosp * commit '3f2c70fb9e2dd503f96958db501729a20bb33c31': Convert instances of px in default UI styles to dip.
Merge commit '3f2c70fb9e2dd503f96958db501729a20bb33c31' into eclair-plus-aosp * commit '3f2c70fb9e2dd503f96958db501729a20bb33c31': Convert instances of px in default UI styles to dip.