Merge "Various LocaleList cleanups"

author Roozbeh Pournader <roozbeh@google.com>

Fri, 5 Feb 2016 01:38:57 +0000 (01:38 +0000)

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

Fri, 5 Feb 2016 01:38:57 +0000 (01:38 +0000)
author Roozbeh Pournader <roozbeh@google.com>
Fri, 5 Feb 2016 01:38:57 +0000 (01:38 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 5 Feb 2016 01:38:57 +0000 (01:38 +0000)
diff --cc services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge
author	Roozbeh Pournader <roozbeh@google.com>
	Fri, 5 Feb 2016 01:38:57 +0000 (01:38 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 5 Feb 2016 01:38:57 +0000 (01:38 +0000)