From: Dongwon Kang <dwkang@google.com>
Date: Wed, 16 Aug 2017 00:59:14 +0000 (+0000)
Subject: [automerger] Merge changes from topic "am-fea5623ffa3c4402ab1f8a9c615e35bb" into... 
X-Git-Tag: android-x86-8.1-r1~31^2^2~36
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1ec168b221;p=android-x86%2Fframeworks-av.git

[automerger] Merge changes from topic "am-fea5623ffa3c4402ab1f8a9c615e35bb" into cw-f-dev am: da78323431 am: d225aa4777
am: 65235e2126

Change-Id: I89e5b6df9e9dd96b3f353d3ca13359e17ede5c00
---

1ec168b221ac992350b020d1560466793cd798d6