resolved conflicts for merge of bc2fb7b9 to jb-dev-plus-aosp

author Jean-Baptiste Queru <jbq@google.com>

Tue, 1 May 2012 16:53:48 +0000 (09:53 -0700)

committer Jean-Baptiste Queru <jbq@google.com>

Tue, 1 May 2012 16:54:38 +0000 (09:54 -0700)
author Jean-Baptiste Queru <jbq@google.com>
Tue, 1 May 2012 16:53:48 +0000 (09:53 -0700)
committer Jean-Baptiste Queru <jbq@google.com>
Tue, 1 May 2012 16:54:38 +0000 (09:54 -0700)
diff --cc Bundle.h
Simple merge
diff --cc ResourceTable.cpp
Simple merge
author	Jean-Baptiste Queru <jbq@google.com>
	Tue, 1 May 2012 16:53:48 +0000 (09:53 -0700)
committer	Jean-Baptiste Queru <jbq@google.com>
	Tue, 1 May 2012 16:54:38 +0000 (09:54 -0700)
		1	2
Bundle.h	patch \|	diff1 \|	diff2 \|	blob \| history
ResourceTable.cpp	patch \|	diff1 \|	diff2 \|	blob \| history