tree 259639a3df3975aefb4ec7ebc5f7e9d21ec0f2f3
parent 65e13171e12cb9e9fc2f608d0c8a92cd3c098648
parent 2677d0da34acad93cd7f164d587ccc30c46facc6
author Mike Lockwood <lockwood@android.com> 1242134797 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1242134797 -0700

am 2677d0d: LocationManager: Fix a Javadoc comment.

Merge commit '2677d0da34acad93cd7f164d587ccc30c46facc6'

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