Merge \\"Make RemoteView margins density-change safe\\" into nyc-dev am: 26e864c398

author Adrian Roos <roosa@google.com>

Tue, 14 Jun 2016 19:53:25 +0000 (19:53 +0000)

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

Tue, 14 Jun 2016 19:53:25 +0000 (19:53 +0000)
author Adrian Roos <roosa@google.com>
Tue, 14 Jun 2016 19:53:25 +0000 (19:53 +0000)
committer android-build-merger <android-build-merger@google.com>
Tue, 14 Jun 2016 19:53:25 +0000 (19:53 +0000)
diff --cc core/java/android/widget/RemoteViews.java
Simple merge
diff --cc core/res/res/values/symbols.xml
Simple merge
author	Adrian Roos <roosa@google.com>
	Tue, 14 Jun 2016 19:53:25 +0000 (19:53 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Tue, 14 Jun 2016 19:53:25 +0000 (19:53 +0000)
		1	2
core/java/android/widget/RemoteViews.java	patch \|	diff1 \|	diff2 \|	blob \| history
core/res/res/values/symbols.xml	patch \|	diff1 \|	diff2 \|	blob \| history