OSDN Git Service

Merge "Use correct synchronization lock" into nyc-dev
authorAmith Yamasani <yamasani@google.com>
Tue, 24 May 2016 18:29:45 +0000 (18:29 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 24 May 2016 18:29:45 +0000 (18:29 +0000)
commit32257dbb4dffb680445d6a18a7418fb95cf63171
tree5bd0387bdbbaeb333527c57d688cfe6f56fbe865
parent964914602b4a62a72e448b0ad7109fea9115ac0e
parent638cc6cac9e35ec5a1410ba2fd63550b53e699ab
Merge "Use correct synchronization lock" into nyc-dev
am: 638cc6cac9

* commit '638cc6cac9e35ec5a1410ba2fd63550b53e699ab':
  Use correct synchronization lock

Change-Id: Ibc7475f21c585ae457412214986cc14ac9ecbe8b