Merge commit '2677d0da34acad93cd7f164d587ccc30c46facc6' * commit '2677d0da34acad93cd7f164d587ccc30c46facc6': LocationManager: Fix a Javadoc comment.
Merge commit '2677d0da34acad93cd7f164d587ccc30c46facc6' * commit '2677d0da34acad93cd7f164d587ccc30c46facc6': LocationManager: Fix a Javadoc comment.