From: Xin Li <delphij@google.com>
Date: Mon, 6 Aug 2018 23:52:50 +0000 (-0700)
Subject: Merge Android Pie into master
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1342ddbaf190c503160cb9aa90d384ccf639592e;p=android-x86%2Fsystem-media.git

Merge Android Pie into master

Bug: 112104996
Change-Id: Ifdec52c860aae39f7d03a7320a6050a2c5f756df
---

1342ddbaf190c503160cb9aa90d384ccf639592e