tree 2c2bcf5bef251496d21c874c4e09deb2f698de43
parent 3de5dba5590d5f1c9b33da8463502905b0ebfc58
parent 0b1ff6be08844c541e36fd735b41990453582ec1
author Kenny Root <kroot@google.com> 1277500871 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1277500871 -0700

am 0b1ff6be: am eb42170e: Display file sizes larger than 2GB correctly

Merge commit '0b1ff6be08844c541e36fd735b41990453582ec1'

* commit '0b1ff6be08844c541e36fd735b41990453582ec1':
  Display file sizes larger than 2GB correctly