am 730f0b23: Merge "Fix 3299611: Use system font for AM/PM indicator" into honeycomb

* commit '730f0b238a20362ff0ae6bdfbd069f0996fc1b39':
  Fix 3299611: Use system font for AM/PM indicator