summaryrefslogtreecommitdiffstats
path: root/location
diff options
context:
space:
mode:
authorNick Kralevich <nnk@google.com>2014-07-05 17:23:25 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-07-05 17:23:25 +0000
commit43c9b107d838d2d152d243151f1728d3b39a2821 (patch)
tree4186057f4ec26a622811e1d15edfa040dc78910e /location
parent61dcb08c856c93247771c1d769deeba61eaf779f (diff)
parent812de6f6d75f71d1c2fd9cd319a78389c5adb703 (diff)
downloadframeworks_base-43c9b107d838d2d152d243151f1728d3b39a2821.zip
frameworks_base-43c9b107d838d2d152d243151f1728d3b39a2821.tar.gz
frameworks_base-43c9b107d838d2d152d243151f1728d3b39a2821.tar.bz2
am 812de6f6: am dbed61c8: am ca2df286: Merge "Fix typo in the exception message."
* commit '812de6f6d75f71d1c2fd9cd319a78389c5adb703': Fix typo in the exception message.
Diffstat (limited to 'location')
-rw-r--r--location/java/android/location/LocationManager.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/location/java/android/location/LocationManager.java b/location/java/android/location/LocationManager.java
index 36778aa..4502a5b 100644
--- a/location/java/android/location/LocationManager.java
+++ b/location/java/android/location/LocationManager.java
@@ -1648,7 +1648,7 @@ public class LocationManager {
}
if (!intent.isTargetedToPackage()) {
IllegalArgumentException e = new IllegalArgumentException(
- "pending intent msut be targeted to package");
+ "pending intent must be targeted to package");
if (mContext.getApplicationInfo().targetSdkVersion > Build.VERSION_CODES.JELLY_BEAN) {
throw e;
} else {