summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSvet Ganov <svetoslavganov@google.com>2015-06-11 08:17:41 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-06-11 08:17:43 +0000
commite545bd36a483b51ef681ea063f7bda9352adb4d4 (patch)
treea09f516fcfbe6cf1e26b59feb3fdb4327329042b
parent056b131ca8c59a00992c7e50c2912e4b14cdc39c (diff)
parent1ed0e553c6cfc231bb2c6f592c7825bc8cf045d8 (diff)
downloadframeworks_base-e545bd36a483b51ef681ea063f7bda9352adb4d4.zip
frameworks_base-e545bd36a483b51ef681ea063f7bda9352adb4d4.tar.gz
frameworks_base-e545bd36a483b51ef681ea063f7bda9352adb4d4.tar.bz2
Merge "Permission group is granted if one permission is granted for UI purposes." into mnc-dev
-rw-r--r--core/java/android/content/Context.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java
index 33f38fb..970623a 100644
--- a/core/java/android/content/Context.java
+++ b/core/java/android/content/Context.java
@@ -1256,7 +1256,7 @@ public abstract class Context {
* @param intent The description of the activity to start.
*
* @throws ActivityNotFoundException &nbsp;
- *
+ *`
* @see #startActivity(Intent, Bundle)
* @see PackageManager#resolveActivity
*/