Commits
Adam Lesinski authored 3fd340028fcM
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
Showing diff to78be0498af2