tree 489ffeed9998280d7402b74ed78bcc61d6cd8872
parent 7fd12db350a341eb7a50759aa329be5281556928
parent 78be0498af2b7d5b6855701ef316f488e2de6f14
author Adam Lesinski <adamlesinski@google.com> 1415066633 -0800
committer Adam Lesinski <adamlesinski@google.com> 1415066782 -0800

Merge commit '78be0498' into manualmerge

Conflicts:
	libs/androidfw/ResourceTypes.cpp
	tools/aapt/Android.mk
	tools/aapt/StringPool.cpp
	tools/aapt/StringPool.h

Change-Id: I9d69efdfb892032895ace12159d193304f02dc6c