tree 62b3168eff594682c1d9a4eac5962a8e782c25c3
parent b45105318d0df386a2785269b9efbfb6130454f8
parent 3d76c4f9dd595bae56391f73f6d4b74cdc44de54
author Seigo Nonaka <nona@google.com> 1495055786 +0000
committer android-build-merger <android-build-merger@google.com> 1495055786 +0000

Merge "Mark mLock as final." into oc-dev am: c1c103a428
am: 3d76c4f9dd

Change-Id: Ie3af0d1f4ed982d7502edbfd7d14415bfc8e1582