Merge "Merge "Store work lock type even it uses unified lock" into nyc-dev am: 610fb8a3f2 am: 56181175a7" into nyc-mr1-dev-plus-aosp

This commit is contained in:
Android Build Merger (Role)
2016-05-26 14:37:06 +00:00
committed by Android (Google) Code Review

Diff Content Not Available