am 1ab8a08a: Merge "Fix for bug: #7172778. Javadoc errors in LocationManager." into jb-mr1-dev
am 1ab8a08a: Merge "Fix for bug: #7172778. Javadoc errors in LocationManager." into jb-mr1-dev

* commit '1ab8a08a9b85aa62045a6a78fd93859382c88b0f':
  Fix for bug: #7172778. Javadoc errors in LocationManager.

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base