tree b1acf75706396a9bddefe4f57e392020cef7c0ca
parent 470d057aedee2f1a8b88a95419f8b1bb42f2120a
parent ab8d6785dcefa5b2b66f6c042475a0f9f558dd45
author Raphael <raphael@google.com> 1323733170 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1323733170 -0800

am ab8d6785: (-s ours) am 2ace3b01: Merge "Merge "AAPT fix printf %zd crash on Windows". Do not merge." into ics-mr1

* commit 'ab8d6785dcefa5b2b66f6c042475a0f9f558dd45':
  Merge "AAPT fix printf %zd crash on Windows". Do not merge.