tree 62e7f8d3286a297917fdfd2953afff56abdacfb5
parent caa21b52d890d988d0252db1a647edf9f432fac5
parent 110c8e8c8cc7365ac05872f64caa0fd60a60f2c8
author Andrew Sapperstein <asapperstein@google.com> 1414955994 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414955994 +0000

am 110c8e8c: am 1218f9c8: Merge "Use locale-specific number for CAB count." into ub-gmail-ur14-dev

* commit '110c8e8c8cc7365ac05872f64caa0fd60a60f2c8':
  Use locale-specific number for CAB count.