Merge "Don't run the WebView preparation if using the same non-replaced package"...

author Gustav Sennton <gsennton@google.com>

Wed, 13 Apr 2016 14:54:53 +0000 (14:54 +0000)

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

Wed, 13 Apr 2016 14:54:54 +0000 (14:54 +0000)
author Gustav Sennton <gsennton@google.com>
Wed, 13 Apr 2016 14:54:53 +0000 (14:54 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 13 Apr 2016 14:54:54 +0000 (14:54 +0000)
diff --cc services/core/java/com/android/server/webkit/WebViewUpdateServiceImpl.java
Simple merge
author	Gustav Sennton <gsennton@google.com>
	Wed, 13 Apr 2016 14:54:53 +0000 (14:54 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 13 Apr 2016 14:54:54 +0000 (14:54 +0000)