From: The Android Open Source Project <initial-contribution@android.com>
Date: Tue, 20 Jan 2009 22:05:35 +0000 (-0800)
Subject: Merge branch 'cupcake'
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/ae0a25e10cf864d00b4e381dbc134057e4f4e598?hp=-c

Merge branch 'cupcake'
---

ae0a25e10cf864d00b4e381dbc134057e4f4e598