am c018f08a: am 43a88375: am 92d99223: Merge "LocationManager javadoc permission fixes" into jb-mr1-dev

* commit 'c018f08a88a773545bcbe6efdeedf737ef79dbaf':
  LocationManager javadoc permission fixes