am db7eefbb: am dd508581: Use min when comparing AM and PM text lengths
automerge: 97b2d18

* commit '97b2d185b655186664ce5402fbce37faaafddf1d':
  Use min when comparing AM and PM text lengths