Merge \"Deprecate Resources constructor and updateConfiguration() method\" into nyc...

author Adam Lesinski <adamlesinski@google.com>

Sat, 16 Jul 2016 02:38:24 +0000 (02:38 +0000)

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

Sat, 16 Jul 2016 02:38:24 +0000 (02:38 +0000)
author Adam Lesinski <adamlesinski@google.com>
Sat, 16 Jul 2016 02:38:24 +0000 (02:38 +0000)
committer android-build-merger <android-build-merger@google.com>
Sat, 16 Jul 2016 02:38:24 +0000 (02:38 +0000)
diff --cc api/current.txt
Simple merge
diff --cc api/system-current.txt
Simple merge
diff --cc api/test-current.txt
Simple merge
author	Adam Lesinski <adamlesinski@google.com>
	Sat, 16 Jul 2016 02:38:24 +0000 (02:38 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Sat, 16 Jul 2016 02:38:24 +0000 (02:38 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/test-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history