merge from open-source master

2009-11-11 08:26:31 -08:00
parent 29f4070ce4 2b63ff51d5
commit 7e2b4f602a
2 changed files with 13 additions and 4 deletions
--- a/services/java/com/android/server/LocationManagerService.java
+++ b/services/java/com/android/server/LocationManagerService.java
@@ -1315,7 +1315,7 @@ public class LocationManagerService extends ILocationManager.Stub implements Run

    /**
     * @return null if the provider does not exits
-     * @throw SecurityException if the provider is not allowed to be
+     * @throws SecurityException if the provider is not allowed to be
     * accessed by the caller
     */
    public Bundle getProviderInfo(String provider) {