tree 9d931c3acde3ec8062e69688220d97211bfb442e
parent ea0fe650000b25fbc1a5feb43a0ac2b507adc062
parent 1f90c4b3fda9dbd2824d67fd679f850572f114dc
author James Dong <jdong@google.com> 1283532938 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1283532938 -0700

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

Merge commit '46e63b346770efa14451b8e67b7f7636c4e5a76c' into gingerbread-plus-aosp

* commit '46e63b346770efa14451b8e67b7f7636c4e5a76c':
  Better file size estimate