tree b4e5fd801557410fc33203d11bc39213a15c28f9
parent 1c4fe5aaff199a8d474684f919cec8ae24914040
parent 3ef1d674806734c2e237a54815ea5c077ce8c344
author Jean-Baptiste Queru <jbq@google.com> 1291677122 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1291677122 -0800

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

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