tree f8598746249759ee55b5af9a5f1d9472e478c842
parent 93c284affe7130df4af8f4ed311ba7ee03c5de82
parent d9f7250a1d53cf1be66fd20b95f1303abb1d2a10
author Victoria Lease <violets@google.com> 1369873201 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1369873201 -0700

am d9f7250a: Merge "break up LocationManagerService\'s WakeLock" into jb-mr2-dev

* commit 'd9f7250a1d53cf1be66fd20b95f1303abb1d2a10':
  break up LocationManagerService's WakeLock