tree 3b48d09a7f7f8dd02cf91577ae47c8cd347c5215
parent 3de504503de030e2befcc6983b74f0a9c0bbebee
parent e4a959ec862ff83a1ceb5904225fbe2d4248a9b8
author Hans Boehm <hboehm@google.com> 1433877816 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1433877816 +0000

am e4a959ec: Merge "Consistently avoid displaying trailing zeroes" into mnc-dev

* commit 'e4a959ec862ff83a1ceb5904225fbe2d4248a9b8':
  Consistently avoid displaying trailing zeroes