From: TreeHugger Robot <treehugger-gerrit@google.com>
Date: Thu, 22 Sep 2016 22:49:34 +0000 (+0000)
Subject: Merge "resolve merge conflicts of 9795ff6 to master"
X-Git-Tag: android-x86-8.1-r1~1262
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=8bb4441fd346b2c3a9b1f598116ec0f88b12a39c;p=android-x86%2Fframeworks-native.git

Merge "resolve merge conflicts of 9795ff6 to master"
---

8bb4441fd346b2c3a9b1f598116ec0f88b12a39c