From: Dan Stoza <stoza@google.com>
Date: Wed, 6 Apr 2016 22:46:44 +0000 (+0000)
Subject: Merge "SF/HWC2: Reorder makeCurrent to avoid deadlock" into nyc-dev
X-Git-Tag: android-x86-8.1-r1~377^2~805
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=fcd8985c813f46537b3d84359dca9a8c9f83b737;p=android-x86%2Fframeworks-native.git

Merge "SF/HWC2: Reorder makeCurrent to avoid deadlock" into nyc-dev
am: 79632ee

* commit '79632ee48a8cddf31a1ec15c0c5217b3d3608622':
  SF/HWC2: Reorder makeCurrent to avoid deadlock

Change-Id: Icbb2f2178e21c213ff879e0a04c4bfda25583d28
---

fcd8985c813f46537b3d84359dca9a8c9f83b737