tree c83f019b6b54c2569f0c7eadb8dc5061cd7aa6d2
parent 19d34821b9c0a74d4269fff0bee87a7f486e1603
parent 7b9eb419e35f12963eeea119b51a241146029b74
author Ricky Wai <rickywai@google.com> 1464270371 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1464270372 +0000

Merge "Store work lock type even it uses unified lock" into nyc-dev