OSDN Git Service

Merge "Annotate locks" into oc-dev am: 373ab72112
authorJulia Reynolds <juliacr@google.com>
Mon, 5 Jun 2017 17:38:58 +0000 (17:38 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 5 Jun 2017 17:38:58 +0000 (17:38 +0000)
am: 27c2b724ae

Change-Id: I180d360fbb2cde9f15e838f3880d2cd0f9eba4ca


Trivial merge