From: Hangyu Kuang <hkuang@google.com>
Date: Wed, 2 Aug 2017 19:22:36 +0000 (+0000)
Subject: Merge "media: Add scaled video thumbnail extractor api." into oc-mr1-dev
X-Git-Tag: android-x86-9.0-r1~410^2~3^2~46
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=40b96c785f;p=android-x86%2Fframeworks-base.git

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

Change-Id: Ibfa5394a612dcec663b1d8b4a301f94b1f2fb49e
---

40b96c785f5f321725a24b7d27caa91dfd77fb36