From: The Android Open Source Project <initial-contribution@android.com>
Date: Thu, 21 May 2009 05:41:10 +0000 (-0700)
Subject: Merge commit 'f479aa0900e9a85afdc78b1048684e37579ebf23'
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/83c9c76327651abd9c134ceb1c49d2120d0caa0a?hp=-c

Merge commit 'f479aa0900e9a85afdc78b1048684e37579ebf23'

Conflicts:
	api/current.xml
	core/res/res/values/public.xml
---

83c9c76327651abd9c134ceb1c49d2120d0caa0a