Merge "Workaround for ignored resizeableActivity param" into nyc-dev

author Andrii Kulian <akulian@google.com>

Thu, 19 May 2016 07:57:19 +0000 (07:57 +0000)

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

Thu, 19 May 2016 07:57:20 +0000 (07:57 +0000)
author Andrii Kulian <akulian@google.com>
Thu, 19 May 2016 07:57:19 +0000 (07:57 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 19 May 2016 07:57:20 +0000 (07:57 +0000)
diff --cc core/java/android/content/pm/PackageParser.java
Simple merge
author	Andrii Kulian <akulian@google.com>
	Thu, 19 May 2016 07:57:19 +0000 (07:57 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 19 May 2016 07:57:20 +0000 (07:57 +0000)