From: Felipe Leme <felipeal@google.com>
Date: Mon, 23 May 2016 21:07:04 +0000 (-0700)
Subject: Resolve merge conflicts of 6108f5d to nyc-mr1-dev
X-Git-Tag: android-x86-7.1-r1~246
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=3518381415d1c1fc580adbe1b398850dcd07ba2b;p=android-x86%2Fframeworks-native.git

Resolve merge conflicts of 6108f5d to nyc-mr1-dev

BUG: 28867848
Change-Id: I99392f1706af5fb9268ad1b32aa7f4b10e397d84
---

3518381415d1c1fc580adbe1b398850dcd07ba2b