Merge "More work on issue #73301635: Ability to extract device configuration"

author TreeHugger Robot <treehugger-gerrit@google.com>

Wed, 28 Feb 2018 23:19:13 +0000 (23:19 +0000)

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

Wed, 28 Feb 2018 23:19:13 +0000 (23:19 +0000)
author TreeHugger Robot <treehugger-gerrit@google.com>
Wed, 28 Feb 2018 23:19:13 +0000 (23:19 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 28 Feb 2018 23:19:13 +0000 (23:19 +0000)
diff --cc core/java/android/app/ActivityManager.java
Simple merge
diff --cc core/java/android/content/res/Configuration.java
Simple merge
diff --cc services/core/java/com/android/server/am/ActivityManagerShellCommand.java
Simple merge
author	TreeHugger Robot <treehugger-gerrit@google.com>
	Wed, 28 Feb 2018 23:19:13 +0000 (23:19 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 28 Feb 2018 23:19:13 +0000 (23:19 +0000)
		1	2
core/java/android/app/ActivityManager.java	patch \|	diff1 \|	diff2 \|	blob \| history
core/java/android/content/res/Configuration.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/am/ActivityManagerShellCommand.java	patch \|	diff1 \|	diff2 \|	blob \| history