OSDN Git Service

Merge "Use correct synchronization lock" into nyc-dev am: 638cc6cac9
authorAmith Yamasani <yamasani@google.com>
Tue, 24 May 2016 18:38:58 +0000 (18:38 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 24 May 2016 18:38:58 +0000 (18:38 +0000)
am: 32257dbb4d

* commit '32257dbb4dffb680445d6a18a7418fb95cf63171':
  Use correct synchronization lock

Change-Id: Ia95571c01a08d2eed39f1c4a6b0266578578956a


Trivial merge