6764f2ca44
Merge commit 'a921bf4e9ff32f4b561af077d11f5dc85ea67d33' into eclair-mr2-plus-aosp * commit 'a921bf4e9ff32f4b561af077d11f5dc85ea67d33': mGeolocationDatabasePath needs to compare mGeolocationDatabasePath