From: Jean-Baptiste Queru <jbq@google.com>
Date: Sun, 26 Jul 2009 18:43:55 +0000 (-0700)
Subject: reconcile korg/master into goog/master
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/03d3b453250863c0d5ca97f3af69342cbd726f48

reconcile korg/master into goog/master
---

03d3b453250863c0d5ca97f3af69342cbd726f48