diff options
| author | Dianne Hackborn <hackbod@google.com> | 2009-07-28 15:23:21 -0700 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2009-07-28 15:23:21 -0700 |
| commit | 02f5228c3c224dc8804cbedd40899fa0c42bfd4a (patch) | |
| tree | 21267ea74f5159b7aa52751c6e8a3de368c08c39 /core/java/android/content/Context.java | |
| parent | b2fe1fd4ae31df7a0366c59c4a1393fb281c4fde (diff) | |
| parent | f0d83fd907e0d2a0b2fe563cea9ffa830ecfd33f (diff) | |
| download | frameworks_base-02f5228c3c224dc8804cbedd40899fa0c42bfd4a.zip frameworks_base-02f5228c3c224dc8804cbedd40899fa0c42bfd4a.tar.gz frameworks_base-02f5228c3c224dc8804cbedd40899fa0c42bfd4a.tar.bz2 | |
resolved conflicts for merge of f0d83fd9 to master
Diffstat (limited to 'core/java/android/content/Context.java')
| -rw-r--r-- | core/java/android/content/Context.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java index c6c9835..84449ef 100644 --- a/core/java/android/content/Context.java +++ b/core/java/android/content/Context.java @@ -1293,7 +1293,8 @@ public abstract class Context { * Use with {@link #getSystemService} to retrieve an * {@blink android.backup.IBackupManager IBackupManager} for communicating * with the backup mechanism. - * + * @hide + * * @see #getSystemService */ public static final String BACKUP_SERVICE = "backup"; |