Merge "Don't crash system server when setting scheduler." into nyc-mr1-dev

author Ruben Brunk <rubenbrunk@google.com>

Thu, 4 Aug 2016 21:59:50 +0000 (21:59 +0000)

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

Thu, 4 Aug 2016 21:59:51 +0000 (21:59 +0000)
author Ruben Brunk <rubenbrunk@google.com>
Thu, 4 Aug 2016 21:59:50 +0000 (21:59 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 4 Aug 2016 21:59:51 +0000 (21:59 +0000)
diff --cc services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge
author	Ruben Brunk <rubenbrunk@google.com>
	Thu, 4 Aug 2016 21:59:50 +0000 (21:59 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 4 Aug 2016 21:59:51 +0000 (21:59 +0000)