tree 60fe7de113a79ffddfdaeaac1e3e72b95188e620
parent 79af1dd54c16cde063152922b42c96d72ae9eca8
parent f2033e473aea4bfd0152feee51129fc4748e6f79
author Nick Pelly <npelly@google.com> 1345229872 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1345229872 -0700

Merge "Fix regression from location changes: GPS battery tracking." into jb-mr1-dev