tree 0eb32808237409a7e01f0d2957e0ed93e796e36c
parent baf5dcb29d5b6986fa4d5138349420b2f0100060
parent 39e8819755aa3581a8faea7d14a17023258b69a4
author Matthew Ng <ngmatthew@google.com> 1496261875 +0000
committer android-build-merger <android-build-merger@google.com> 1496261875 +0000

Merge "Added missing lock and clean up locked function that wasn't locked" into oc-dev
am: 39e8819755

Change-Id: If5f5953b95e27a809b50f7baac8a9a9ab99b1a14