From: Amith Yamasani <yamasani@google.com>
Date: Tue, 24 May 2016 18:38:58 +0000 (+0000)
Subject: Merge "Use correct synchronization lock" into nyc-dev am: 638cc6cac9
X-Git-Tag: android-x86-8.1-r1~2121^2~8013
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=663cf283de;p=android-x86%2Fframeworks-base.git

Merge "Use correct synchronization lock" into nyc-dev am: 638cc6cac9
am: 32257dbb4d

* commit '32257dbb4dffb680445d6a18a7418fb95cf63171':
  Use correct synchronization lock

Change-Id: Ia95571c01a08d2eed39f1c4a6b0266578578956a
---

663cf283de26e9a98df78c14c4b89dfd7c1e60c3