resolved conflicts for merge of ec42199a to klp-modular-dev-plus-aosp

author Elliott Hughes <enh@google.com>

Fri, 18 Apr 2014 22:56:46 +0000 (15:56 -0700)

committer Elliott Hughes <enh@google.com>

Fri, 18 Apr 2014 22:56:46 +0000 (15:56 -0700)
author Elliott Hughes <enh@google.com>
Fri, 18 Apr 2014 22:56:46 +0000 (15:56 -0700)
committer Elliott Hughes <enh@google.com>
Fri, 18 Apr 2014 22:56:46 +0000 (15:56 -0700)
diff --cc tools/aapt/Bundle.h
Simple merge
diff --cc tools/aapt/Command.cpp
Simple merge
author	Elliott Hughes <enh@google.com>
	Fri, 18 Apr 2014 22:56:46 +0000 (15:56 -0700)
committer	Elliott Hughes <enh@google.com>
	Fri, 18 Apr 2014 22:56:46 +0000 (15:56 -0700)
		1	2
tools/aapt/Bundle.h	patch \|	diff1 \|	diff2 \|	blob \| history
tools/aapt/Command.cpp	patch \|	diff1 \|	diff2 \|	blob \| history