From: Naveen Kalla <mrnaveen@google.com>
Date: Fri, 28 Oct 2016 23:16:34 +0000 (+0000)
Subject: resolve merge conflicts of de591df to nyc-mr2-dev-plus-aosp
X-Git-Tag: android-x86-8.1-r1~1113
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c362b894a87876c37131b9a7beadf9649d25ff5b;p=android-x86%2Fframeworks-native.git

resolve merge conflicts of de591df to nyc-mr2-dev-plus-aosp
am: 27de3fc0a1  -s ours

Change-Id: I6184d22117a81ba5a7b0a8b18108eb9f178d08f9
---

c362b894a87876c37131b9a7beadf9649d25ff5b