From: Marco Nelissen Date: Tue, 10 Oct 2017 22:18:25 +0000 (+0000) Subject: Merge changes from topic "b23270724" into nyc-dev am: 45a05eb567 am: e79b2f044c ... X-Git-Tag: android-x86-8.1-r1~29^2~3^2^2 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=fc64ad47f6;p=android-x86%2Fframeworks-av.git Merge changes from topic "b23270724" into nyc-dev am: 45a05eb567 am: e79b2f044c -s ours am: 4758facf28 am: db1e02306c am: 32d62af8e0 Change-Id: I9f59f0429fdbb0e6bc6607b3e757fc1ac8f017b1 --- fc64ad47f6ffa4fe09e10542ffba91eec3dbab47