Merge "Adjust nativeLibraryDir for package contexts of multiArch installs." into...

author Narayan Kamath <narayan@google.com>

Wed, 16 Jul 2014 17:58:26 +0000 (17:58 +0000)

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

Wed, 16 Jul 2014 01:00:53 +0000 (01:00 +0000)
author Narayan Kamath <narayan@google.com>
Wed, 16 Jul 2014 17:58:26 +0000 (17:58 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 16 Jul 2014 01:00:53 +0000 (01:00 +0000)
diff --cc services/core/java/com/android/server/pm/PackageManagerService.java
Simple merge
author	Narayan Kamath <narayan@google.com>
	Wed, 16 Jul 2014 17:58:26 +0000 (17:58 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 16 Jul 2014 01:00:53 +0000 (01:00 +0000)