From: android-build SharedAccount <android-build@undroid16.corp.google.com>
Date: Fri, 16 Jan 2009 00:16:01 +0000 (-0800)
Subject: Merge branch 'cupcake'
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/2843f9b794ba59875f8810c886081cdd954ca25f?hp=a189615a5671748c348da8ab79042e9e2746eb5e

Merge branch 'cupcake'
---