Merge "Add a check to adjust thumbnail scaling for full screen shots on TV" into...

author Sid Soundararajan <ssoundar@google.com>

Mon, 23 May 2016 20:01:03 +0000 (20:01 +0000)

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

Mon, 23 May 2016 20:01:03 +0000 (20:01 +0000)
author Sid Soundararajan <ssoundar@google.com>
Mon, 23 May 2016 20:01:03 +0000 (20:01 +0000)
committer android-build-merger <android-build-merger@google.com>
Mon, 23 May 2016 20:01:03 +0000 (20:01 +0000)
diff --cc core/res/res/values/symbols.xml
Simple merge
diff --cc services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge
author	Sid Soundararajan <ssoundar@google.com>
	Mon, 23 May 2016 20:01:03 +0000 (20:01 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Mon, 23 May 2016 20:01:03 +0000 (20:01 +0000)
		1	2
core/res/res/values/symbols.xml	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/am/ActivityManagerService.java	patch \|	diff1 \|	diff2 \|	blob \| history