diff options
| author | Rich Cannings <richc@google.com> | 2012-08-08 15:11:15 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-08 15:11:15 -0700 |
| commit | b38cb4da4ac4354b3973f80ecd6b73f1c5fa9376 (patch) | |
| tree | 8d29ceca7a763f90281f4111b06c0695daf07102 /api | |
| parent | e5394f85a6cd9607dbc6d976643b8de8ad1d91cd (diff) | |
| parent | 22c5c52d43d055db307e6a0136180e7995db49f1 (diff) | |
| download | frameworks_base-b38cb4da4ac4354b3973f80ecd6b73f1c5fa9376.zip frameworks_base-b38cb4da4ac4354b3973f80ecd6b73f1c5fa9376.tar.gz frameworks_base-b38cb4da4ac4354b3973f80ecd6b73f1c5fa9376.tar.bz2 | |
am 22c5c52d: am a56d9cec: Merge "Revert "Pass URLs to package verifiers"" into jb-mr1-dev
* commit '22c5c52d43d055db307e6a0136180e7995db49f1':
Revert "Pass URLs to package verifiers"
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt index b8a1045..32af140 100644 --- a/api/current.txt +++ b/api/current.txt @@ -5832,7 +5832,7 @@ package android.content { field public static final java.lang.String EXTRA_KEY_EVENT = "android.intent.extra.KEY_EVENT"; field public static final java.lang.String EXTRA_LOCAL_ONLY = "android.intent.extra.LOCAL_ONLY"; field public static final java.lang.String EXTRA_NOT_UNKNOWN_SOURCE = "android.intent.extra.NOT_UNKNOWN_SOURCE"; - field public static final java.lang.String EXTRA_ORIGINATING_URI = "android.intent.extra.ORIGINATING_URI"; + field public static final java.lang.String EXTRA_ORIGINATING_URL = "android.intent.extra.ORIGINATING_URL"; field public static final java.lang.String EXTRA_PHONE_NUMBER = "android.intent.extra.PHONE_NUMBER"; field public static final java.lang.String EXTRA_REFERRER = "android.intent.extra.REFERRER"; field public static final java.lang.String EXTRA_REMOTE_INTENT_TOKEN = "android.intent.extra.remote_intent_token"; |