diff options
| author | rich cannings <richc@google.com> | 2012-08-02 15:10:40 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-02 15:10:40 -0700 |
| commit | 3cfe6d5ceffa05243b00821a53b39d5e5d4f7ab1 (patch) | |
| tree | 106598bc305303b07db5204151819744a30ef37e /api | |
| parent | 698f9516346cc257504cb5807539a735e6fee63c (diff) | |
| parent | 8c96817480863aff8554f95da4f2151b0e9ee5e9 (diff) | |
| download | frameworks_base-3cfe6d5ceffa05243b00821a53b39d5e5d4f7ab1.zip frameworks_base-3cfe6d5ceffa05243b00821a53b39d5e5d4f7ab1.tar.gz frameworks_base-3cfe6d5ceffa05243b00821a53b39d5e5d4f7ab1.tar.bz2 | |
am 8c968174: am 9866d60e: Merge "Pass URLs to package verifiers" into jb-mr1-dev
* commit '8c96817480863aff8554f95da4f2151b0e9ee5e9':
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 b4a2b6e..1fbdc43 100644 --- a/api/current.txt +++ b/api/current.txt @@ -5825,7 +5825,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_URL = "android.intent.extra.ORIGINATING_URL"; + field public static final java.lang.String EXTRA_ORIGINATING_URI = "android.intent.extra.ORIGINATING_URI"; 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"; |