Merge "Revert "AssetManager: Cache a pre-filtered list of configurations"" into nyc-dev

author Adam Lesinski <adamlesinski@google.com>

Mon, 7 Mar 2016 20:22:23 +0000 (20:22 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Mon, 7 Mar 2016 20:22:24 +0000 (20:22 +0000)
author Adam Lesinski <adamlesinski@google.com>
Mon, 7 Mar 2016 20:22:23 +0000 (20:22 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Mon, 7 Mar 2016 20:22:24 +0000 (20:22 +0000)
diff --cc include/androidfw/ResourceTypes.h
Simple merge
diff --cc libs/androidfw/ResourceTypes.cpp
Simple merge
author	Adam Lesinski <adamlesinski@google.com>
	Mon, 7 Mar 2016 20:22:23 +0000 (20:22 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Mon, 7 Mar 2016 20:22:24 +0000 (20:22 +0000)
		1	2
include/androidfw/ResourceTypes.h	patch \|	diff1 \|	diff2 \|	blob \| history
libs/androidfw/ResourceTypes.cpp	patch \|	diff1 \|	diff2 \|	blob \| history