Merge "DO NOT MERGE - Ensuring that there are per-user last stack active times."...

author Manu Cornet <manucornet@google.com>

Thu, 16 Feb 2017 03:13:14 +0000 (03:13 +0000)

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

Thu, 16 Feb 2017 03:13:14 +0000 (03:13 +0000)
author Manu Cornet <manucornet@google.com>
Thu, 16 Feb 2017 03:13:14 +0000 (03:13 +0000)
committer android-build-merger <android-build-merger@google.com>
Thu, 16 Feb 2017 03:13:14 +0000 (03:13 +0000)
diff --cc core/java/android/provider/Settings.java
Simple merge
diff --cc packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java
Simple merge
author	Manu Cornet <manucornet@google.com>
	Thu, 16 Feb 2017 03:13:14 +0000 (03:13 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Thu, 16 Feb 2017 03:13:14 +0000 (03:13 +0000)
		1	2
core/java/android/provider/Settings.java	patch \|	diff1 \|	diff2 \|	blob \| history
packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java	patch \|	diff1 \|	diff2 \|	blob \| history