From: Jean-Baptiste Queru <jbq@google.com>
Date: Wed, 20 May 2009 18:28:11 +0000 (-0700)
Subject: reconcile donut snapshot
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/1fcf29a0fb4443ce145dfc9dd1c2872312ec9a72?ds=sidebyside;hp=--cc

reconcile donut snapshot

Merge branch 'donut-snapshot' into HEAD
---

1fcf29a0fb4443ce145dfc9dd1c2872312ec9a72