tree aa185e02040b8bc38a34a4be72a805fdde46a951
parent ed0830c502d7403d69abfd8247c046ac2746ac8c
parent 7c3bef85dab709326e052fec1fdc8b32e47c811e
author Raphael <raphael@google.com> 1323724452 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1323724452 -0800

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