Merge "Start MountService before performBootDexOpt"

author Narayan Kamath <narayan@google.com>

Wed, 26 Nov 2014 10:59:28 +0000 (10:59 +0000)

committer Gerrit Code Review <noreply-gerritcodereview@google.com>

Wed, 26 Nov 2014 10:59:29 +0000 (10:59 +0000)
author Narayan Kamath <narayan@google.com>
Wed, 26 Nov 2014 10:59:28 +0000 (10:59 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Wed, 26 Nov 2014 10:59:29 +0000 (10:59 +0000)
diff --cc services/java/com/android/server/SystemServer.java
Simple merge
author	Narayan Kamath <narayan@google.com>
	Wed, 26 Nov 2014 10:59:28 +0000 (10:59 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Wed, 26 Nov 2014 10:59:29 +0000 (10:59 +0000)