From: Lajos Molnar <lajos@google.com>
Date: Mon, 14 Aug 2017 23:39:56 +0000 (+0000)
Subject: Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into mnc-dr1.5-dev
X-Git-Tag: android-x86-8.1-r1~31^2^2~5^2^2~5^2~2^2^2^2~25
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f0bda45342081033c45500347c54fa21ed5477b5;p=android-x86%2Fframeworks-av.git

Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into mnc-dr1.5-dev
am: 1e314546c8

Change-Id: Idd5a40230bbfc2a30a920a1a9b8b58632cdc33fd
---

f0bda45342081033c45500347c54fa21ed5477b5