Merge commit '4dee223c68d98ebac6bb3d91c2d6e47eb2b0a001' into eclair-mr2-plus-aosp * commit '4dee223c68d98ebac6bb3d91c2d6e47eb2b0a001': LocationManagerService: clear calling identity in mock provider calls.
Merge commit '4dee223c68d98ebac6bb3d91c2d6e47eb2b0a001' into eclair-mr2-plus-aosp * commit '4dee223c68d98ebac6bb3d91c2d6e47eb2b0a001': LocationManagerService: clear calling identity in mock provider calls.