tree 59d92542c9cb0ffd562ad67504405088a6872a07
parent d7047b0ca1c42ef7519aede116f7a2ee2b03595a
parent 5fa153302c1c7f179bfd6ddd301e7526b8c06de5
author Android (Google) Code Review <android-gerrit@google.com> 1241037322 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1241037322 -0700

am 5fa1533: Merge change 482 into donut

Merge commit '5fa153302c1c7f179bfd6ddd301e7526b8c06de5'

* commit '5fa153302c1c7f179bfd6ddd301e7526b8c06de5':
  location: Location Manager wakelock cleanup, phase 2