am 11eada78: am ba2ec2b4: Merge "Enable framework GPS and location manager logging" into gingerbread

Merge commit '11eada780dc82fcac2a1dad4e2dde1d310b4231c'

* commit '11eada780dc82fcac2a1dad4e2dde1d310b4231c':
  Enable framework GPS and location manager logging