am 51ff6f95: (-s ours) am d9f7250a: Merge "break up LocationManagerService\'s WakeLock" into jb-mr2-dev
* commit '51ff6f953c8ddb89fdcdccc9799445b65556b711': break up LocationManagerService's WakeLock
This commit is contained in: