summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorCraig Mautner <cmautner@google.com>2013-08-27 21:20:30 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-08-27 21:20:30 +0000
commitac738a25f8d0a9fcd5e30ad1a7b98683726c49f3 (patch)
treee5fd79f9fa7ac8fbbf3b5f62868b1d80cb69a8fc /core
parentd381680b63a36f8a4f1b07286947f1227d83139d (diff)
parent2703052413387a0ba9d66f04b6e0421d5f59674e (diff)
downloadframeworks_base-ac738a25f8d0a9fcd5e30ad1a7b98683726c49f3.zip
frameworks_base-ac738a25f8d0a9fcd5e30ad1a7b98683726c49f3.tar.gz
frameworks_base-ac738a25f8d0a9fcd5e30ad1a7b98683726c49f3.tar.bz2
Merge "Hide stackId from prying eyes." into klp-dev
Diffstat (limited to 'core')
-rw-r--r--core/java/android/app/ActivityManager.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/java/android/app/ActivityManager.java b/core/java/android/app/ActivityManager.java
index 6ac2e80..7c40bb1 100644
--- a/core/java/android/app/ActivityManager.java
+++ b/core/java/android/app/ActivityManager.java
@@ -490,6 +490,7 @@ public class ActivityManager {
/**
* The id of the ActivityStack this Task was on most recently.
+ * @hide
*/
public int stackId;