Commits
Craig Mautner authored and Android Git Automerger committed 07f1a6cecaaM
am 78db8500: am 2c37f7b4: Merge "Synchronize access to Locked methods. DO NOT MERGE" into jb-mr1.1-dev * commit '78db850049b2312a82f408373d22c83c5ad8fa56': Synchronize access to Locked methods. DO NOT MERGE
Showing diff to4856186d96a