am 502cd5ba: am 4a22568d: Merge "Forcing tabs to be single line and width bound (Bug 5646142)" into ics-mr1

* commit '502cd5ba077f6c0febf13f22e4648705c1e1bf25':
  Forcing tabs to be single line and width bound (Bug 5646142)