tree 39ea7f414d1c195aca8fde0de7f49970718e8e0e
parent 29ead58259d47997d7caedf9080f4a2f9c9bd358
parent 4985f06f4e96351c77b88b20bc9ded65daefcd3e
author Jean-Baptiste Queru <jbq@google.com> 1291677035 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1291677035 -0800

am 4985f06f: Merge "Make image-size-from-data-size not use hard coded values."

* commit '4985f06f4e96351c77b88b20bc9ded65daefcd3e':
  Make image-size-from-data-size not use hard coded values.