diff options
author | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-27 10:50:53 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2009-07-27 10:50:53 -0700 |
commit | 143a2ce1ea33aeba81cff26f66144065d379dc64 (patch) | |
tree | 9ab90c2cd4eee95af89100d22a66cfbc5a1327c2 /api | |
parent | 461628716e3b6ea217839ef584375e81436b77fc (diff) | |
parent | ba989ad0ed91beda010d44945fa015d75d99cf67 (diff) | |
download | frameworks_base-143a2ce1ea33aeba81cff26f66144065d379dc64.zip frameworks_base-143a2ce1ea33aeba81cff26f66144065d379dc64.tar.gz frameworks_base-143a2ce1ea33aeba81cff26f66144065d379dc64.tar.bz2 |
am ba989ad0: Merge change 8648 into donut
Merge commit 'ba989ad0ed91beda010d44945fa015d75d99cf67'
* commit 'ba989ad0ed91beda010d44945fa015d75d99cf67':
Use the old string for bookmarks permissions.
Diffstat (limited to 'api')
-rw-r--r-- | api/current.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/api/current.xml b/api/current.xml index e76686f..4dee3d2 100644 --- a/api/current.xml +++ b/api/current.xml @@ -731,7 +731,7 @@ type="java.lang.String" transient="false" volatile="false" - value=""android.permission.READ_HISTORY_BOOKMARKS"" + value=""com.android.browser.permission.READ_HISTORY_BOOKMARKS"" static="true" final="true" deprecated="not deprecated" @@ -1204,7 +1204,7 @@ type="java.lang.String" transient="false" volatile="false" - value=""android.permission.WRITE_HISTORY_BOOKMARKS"" + value=""com.android.browser.permission.WRITE_HISTORY_BOOKMARKS"" static="true" final="true" deprecated="not deprecated" |