From: Lajos Molnar <lajos@google.com>
Date: Tue, 15 Aug 2017 23:11:00 +0000 (+0000)
Subject: [automerger] Merge commit 'e42038e5c7286a15a50dd1decfa1a579dbda8cd6' into HEAD am... 
X-Git-Tag: android-x86-8.1-r1~31^2^2~5^2^2~39
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b852352e7e1a79d46cce9b836dec00aaf28b7cca;p=android-x86%2Fframeworks-av.git

[automerger] Merge commit 'e42038e5c7286a15a50dd1decfa1a579dbda8cd6' into HEAD am: 1ec4196300 am: dba49298e2 am: b9348d12a8 am: 983ab59558 am: bd7625f2fe am: 2f21aace53 am: b789b06d45 am: b433798478 am: dd40ebdfc8 am: 27a03fc3d9
am: dbccb4fba9

Change-Id: I2fb13f75ace99549375bea0ceecfb116b1d701b5
---

b852352e7e1a79d46cce9b836dec00aaf28b7cca