Merge "media: Add scaled video thumbnail extractor api." into oc-mr1-dev

author Hangyu Kuang <hkuang@google.com>

Wed, 2 Aug 2017 19:22:36 +0000 (19:22 +0000)

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

Wed, 2 Aug 2017 19:22:36 +0000 (19:22 +0000)
author Hangyu Kuang <hkuang@google.com>
Wed, 2 Aug 2017 19:22:36 +0000 (19:22 +0000)
committer android-build-merger <android-build-merger@google.com>
Wed, 2 Aug 2017 19:22:36 +0000 (19:22 +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	Hangyu Kuang <hkuang@google.com>
	Wed, 2 Aug 2017 19:22:36 +0000 (19:22 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Wed, 2 Aug 2017 19:22:36 +0000 (19:22 +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