From: Lajos Molnar <lajos@google.com>
Date: Wed, 16 Aug 2017 01:45:48 +0000 (+0000)
Subject: [automerger] Merge changes from topic "am-1e7935a2-3929-4000-bb19-9e0ff0e29216" into... 
X-Git-Tag: android-x86-8.1-r1~31^2^2~19
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=608b18dfc63df8440a8eb022b704a75214a39bf8;p=android-x86%2Fframeworks-av.git

[automerger] Merge changes from topic "am-1e7935a2-3929-4000-bb19-9e0ff0e29216" into cw-f-dev am: ae2d8ccc79 am: 02cf7d9038
am: dc41d373b4

Change-Id: I65b8cf42fdf3623cb3c732bfef78196aff246a44
---

608b18dfc63df8440a8eb022b704a75214a39bf8