Merge "Merge "Use correct synchronization lock" into nyc-dev am: 638cc6cac9 am: 23ef1f7653" into nyc-mr1-dev-plus-aosp

This commit is contained in:
Android Build Merger (Role)
2016-05-24 18:45:06 +00:00
committed by Android (Google) Code Review

Diff Content Not Available