OSDN Git Service

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

* commit '638cc6cac9e35ec5a1410ba2fd63550b53e699ab':
  Use correct synchronization lock

Change-Id: I834766e3191a2bc4cef1587714522031fe3f24de