tree 37d0c1ef445d38b28532a6c81016135448ce6751
parent cc538e0527779602a3db0ac54df8a76d52311b95
parent 97b2d185b655186664ce5402fbce37faaafddf1d
author Alan Viverette <alanv@google.com> 1420488872 +0000
committer android-build-merger <android-build-merger@google.com> 1420488872 +0000

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