Merge "Fix a bunch of repeated reads of a ro.* property" am: 4265991701 am: e4c2e8f303

author John Reck <jreck@google.com>

Fri, 27 Jan 2017 23:05:52 +0000 (23:05 +0000)

committer android-build-merger <android-build-merger@google.com>

Fri, 27 Jan 2017 23:05:52 +0000 (23:05 +0000)
author John Reck <jreck@google.com>
Fri, 27 Jan 2017 23:05:52 +0000 (23:05 +0000)
committer android-build-merger <android-build-merger@google.com>
Fri, 27 Jan 2017 23:05:52 +0000 (23:05 +0000)
diff --cc core/java/android/app/ActivityManager.java
Simple merge
diff --cc core/java/android/os/UserManager.java
Simple merge
author	John Reck <jreck@google.com>
	Fri, 27 Jan 2017 23:05:52 +0000 (23:05 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Fri, 27 Jan 2017 23:05:52 +0000 (23:05 +0000)
		1	2
core/java/android/app/ActivityManager.java	patch \|	diff1 \|	diff2 \|	blob \| history
core/java/android/os/UserManager.java	patch \|	diff1 \|	diff2 \|	blob \| history