tree aa185e02040b8bc38a34a4be72a805fdde46a951
parent 18ad6514bbeb68a96c12ba1636ab8df8e3945f37
parent 2ace3b01ab9447ce9fda2f578e31c1c11f4837cb
author Raphael <raphael@google.com> 1323724595 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1323724595 -0800

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

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