From: Lajos Molnar <lajos@google.com>
Date: Tue, 15 Aug 2017 00:03:53 +0000 (+0000)
Subject: Merge changes from topic "am-a0a1f3414b9a4b419037551f894343bc" 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~19
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1cd6d429d13f99388c8eab3b07a6def447af8aea;p=android-x86%2Fframeworks-av.git

Merge changes from topic "am-a0a1f3414b9a4b419037551f894343bc" into mnc-dr1.5-dev
am: a5c3676d9f

Change-Id: Iacc37b5a3bc7ddfabfad0b9aa7f9214ce3cf1b72
---

1cd6d429d13f99388c8eab3b07a6def447af8aea