Merge commit '1b15acf705a6bcca333b1e8a6a48039242cc7d57' into eclair-mr2-plus-aosp * commit '1b15acf705a6bcca333b1e8a6a48039242cc7d57': Allow room for descenders in am/pm text.
Merge commit '1b15acf705a6bcca333b1e8a6a48039242cc7d57' into eclair-mr2-plus-aosp * commit '1b15acf705a6bcca333b1e8a6a48039242cc7d57': Allow room for descenders in am/pm text.