diff options
| author | Craig Mautner <cmautner@google.com> | 2013-08-27 14:23:04 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-08-27 14:23:04 -0700 |
| commit | 8fce994c8472a29197aa4c5dae070c7be518ad3f (patch) | |
| tree | 922f0ffccd58a918c086d7ac1d64d1b686452f7f /core | |
| parent | 4b739259d2a451df9bd317b1ce2d1c0169ab9e6e (diff) | |
| parent | ac738a25f8d0a9fcd5e30ad1a7b98683726c49f3 (diff) | |
| download | frameworks_base-8fce994c8472a29197aa4c5dae070c7be518ad3f.zip frameworks_base-8fce994c8472a29197aa4c5dae070c7be518ad3f.tar.gz frameworks_base-8fce994c8472a29197aa4c5dae070c7be518ad3f.tar.bz2 | |
am ac738a25: Merge "Hide stackId from prying eyes." into klp-dev
* commit 'ac738a25f8d0a9fcd5e30ad1a7b98683726c49f3':
Hide stackId from prying eyes.
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/app/ActivityManager.java | 1 |
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; |