am f4750724: am 9d829f98: am 21e6e2de: Merge "Change generated dependency file names"

author Xavier Ducrohet <xav@android.com>

Thu, 18 Aug 2011 21:48:49 +0000 (14:48 -0700)

committer Android Git Automerger <android-git-automerger@android.com>

Thu, 18 Aug 2011 21:48:49 +0000 (14:48 -0700)
author Xavier Ducrohet <xav@android.com>
Thu, 18 Aug 2011 21:48:49 +0000 (14:48 -0700)
committer Android Git Automerger <android-git-automerger@android.com>
Thu, 18 Aug 2011 21:48:49 +0000 (14:48 -0700)
diff --cc Command.cpp
Simple merge
diff --cc Package.cpp
Simple merge
diff --cc Resource.cpp
Simple merge
author	Xavier Ducrohet <xav@android.com>
	Thu, 18 Aug 2011 21:48:49 +0000 (14:48 -0700)
committer	Android Git Automerger <android-git-automerger@android.com>
	Thu, 18 Aug 2011 21:48:49 +0000 (14:48 -0700)
		1	2
Command.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
Package.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
Resource.cpp	patch \|	diff1 \|	diff2 \|	blob \| history