From: Jean-Baptiste Queru <jbq@google.com>
Date: Sun, 15 Nov 2009 22:03:15 +0000 (-0800)
Subject: merge from open-source master
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/e44f31f5e05de7c970e9bbe61e42577a244c0321

merge from open-source master

Merge commit 'goog/stage-korg-master^' into HEAD
---

e44f31f5e05de7c970e9bbe61e42577a244c0321