From: Jean-Baptiste Queru <jbq@google.com>
Date: Thu, 23 Apr 2009 00:56:58 +0000 (-0700)
Subject: merge cupcake into donut
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/b8a4c9746836873f160871b780ce3e3ce935e42b

merge cupcake into donut
---

b8a4c9746836873f160871b780ce3e3ce935e42b