am bce7055a: am dfe1e170: am 37de3993: am 55b00376: Merge "Fix the undo line colors" into ub-gmail-ur14-dev

* commit 'bce7055abfd0fac4d173cdfaa4904b4ea3ca6131':
  Fix the undo line colors