Merge "Give the AM/PM buttons slightly more content area" into nyc-dev am:...
Merge "Give the AM/PM buttons slightly more content area" into nyc-dev am: bacbcba6 am: e3698ea7
am: ef64afe2
* commit 'ef64afe2':
Give the AM/PM buttons slightly more content area
Change-Id: I3dcd6731e514757cc30f8c2ab9ee5725fba987e2