Merge "Merge "Use correct synchronization lock" into nyc-dev am: 638cc6cac9 am: 23ef1f7653" into nyc-mr1-dev-plus-aosp
This commit is contained in:
committed by
Android (Google) Code Review
commit
111bab51dd