tree 28a0fd399e6369195435cb299b53fe27cbc656d1
parent fbc6db2e7af12b88703b4cbaa4c7b979bc9d028e
parent de428f1d27a2f5039b228aa6e011f8651539b43a
author James Dong <jdong@google.com> 1283533145 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1283533145 -0700

am 3c3fc97e: am 46e63b34: Merge "Better file size estimate" into gingerbread

Merge commit '3c3fc97e104bd17af608727d82e965fc28f2c89d'

* commit '3c3fc97e104bd17af608727d82e965fc28f2c89d':
  Better file size estimate