tree fb34946075009696bcbe543477eb08ff67949b07
parent 0a2d8709e4badeeb892b325c1b6fd52ad16f9c7d
parent 0dac8c0f7ec00d94b09f92823fa238142163aba8
author Mike Lockwood <lockwood@google.com> 1263927799 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1263927799 -0800

Merge "LocationManagerService: Fix bug removing proximity alerts."