From: Jean-Baptiste Queru <jbq@google.com>
Date: Wed, 20 May 2009 18:49:58 +0000 (-0700)
Subject: am d3f14a62: reconcile donut snapshot
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/9c885e91ecbae47dcae47f71fa0eea7e50793e22?hp=--cc

am d3f14a62: reconcile donut snapshot

Merge commit 'd3f14a625e74a93e52b8b9aa5363a5de50129ea9'

* commit 'd3f14a625e74a93e52b8b9aa5363a5de50129ea9':
  donut snapshot
---

9c885e91ecbae47dcae47f71fa0eea7e50793e22