tree ef39a26bf34e04162aa0a972824d39c4fd6024c3
parent dfcc2da839dc7abc772053c8a05b96a5b6ba17fc
parent c1c103a4285a0da52cf6c64c719d26522e0804cf
author Seigo Nonaka <nona@google.com> 1494957548 +0000
committer android-build-merger <android-build-merger@google.com> 1494957548 +0000

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

Change-Id: Ic84507afaeab8619b6b08a629195c73ddcf164c2