Merge "Prepare app data only when storage is available."

author Jeff Sharkey <jsharkey@google.com>

Sat, 16 Jan 2016 00:41:08 +0000 (00:41 +0000)

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

Sat, 16 Jan 2016 00:41:08 +0000 (00:41 +0000)
author Jeff Sharkey <jsharkey@google.com>
Sat, 16 Jan 2016 00:41:08 +0000 (00:41 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Sat, 16 Jan 2016 00:41:08 +0000 (00:41 +0000)
diff --cc services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge
diff --cc services/core/java/com/android/server/pm/PackageManagerService.java
Simple merge
diff --cc services/core/java/com/android/server/pm/Settings.java
Simple merge
author	Jeff Sharkey <jsharkey@google.com>
	Sat, 16 Jan 2016 00:41:08 +0000 (00:41 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Sat, 16 Jan 2016 00:41:08 +0000 (00:41 +0000)
		1	2
services/core/java/com/android/server/am/ActivityManagerService.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/pm/PackageManagerService.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/pm/Settings.java	patch \|	diff1 \|	diff2 \|	blob \| history