From: Lajos Molnar <lajos@google.com>
Date: Fri, 9 Sep 2016 17:11:33 +0000 (+0000)
Subject: Merge changes I801c77b8,I3d5bad4a into lmp-mr1-dev am: 7c36c95b19 am: 4e3aea6a85... 
X-Git-Tag: android-x86-7.1-r1~24^2~8^2~16^2~5^2^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=890ef9f40f;p=android-x86%2Fframeworks-av.git

Merge changes I801c77b8,I3d5bad4a into lmp-mr1-dev am: 7c36c95b19 am: 4e3aea6a85 am: 4390796eeb am: 511cbadc98
am: b5ae909c74

Change-Id: I2a34e07a5e122991d00d28163ed606ef89839eed
---

890ef9f40f05d1c3a335100bc3d0085c051ff43c