Merge "Persist configuration for the calling or current user" into nyc-mr1-dev

author Amith Yamasani <yamasani@google.com>

Tue, 26 Jul 2016 22:48:13 +0000 (22:48 +0000)

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

Tue, 26 Jul 2016 22:48:14 +0000 (22:48 +0000)
author Amith Yamasani <yamasani@google.com>
Tue, 26 Jul 2016 22:48:13 +0000 (22:48 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 26 Jul 2016 22:48:14 +0000 (22:48 +0000)
diff --cc services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge
author	Amith Yamasani <yamasani@google.com>
	Tue, 26 Jul 2016 22:48:13 +0000 (22:48 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 26 Jul 2016 22:48:14 +0000 (22:48 +0000)