am 72eb0aca: Merge change 5483 into donut

author Android (Google) Code Review <android-gerrit@google.com>

Mon, 29 Jun 2009 23:37:17 +0000 (16:37 -0700)

committer The Android Open Source Project <initial-contribution@android.com>

Mon, 29 Jun 2009 23:37:17 +0000 (16:37 -0700)
author Android (Google) Code Review <android-gerrit@google.com>
Mon, 29 Jun 2009 23:37:17 +0000 (16:37 -0700)
committer The Android Open Source Project <initial-contribution@android.com>
Mon, 29 Jun 2009 23:37:17 +0000 (16:37 -0700)
diff --cc AaptAssets.h
Simple merge
diff --cc Command.cpp
Simple merge
author	Android (Google) Code Review <android-gerrit@google.com>
	Mon, 29 Jun 2009 23:37:17 +0000 (16:37 -0700)
committer	The Android Open Source Project <initial-contribution@android.com>
	Mon, 29 Jun 2009 23:37:17 +0000 (16:37 -0700)
		1	2
AaptAssets.h	patch \|	diff1 \|	diff2 \|	blob \| history
Command.cpp	patch \|	diff1 \|	diff2 \|	blob \| history