Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a5555ae0 authored by The Android Automerger's avatar The Android Automerger
Browse files

Merge branch 'froyo' into froyo-release

parents 6608d398 0ca25191

Android.mk

+4 −4
Original line number Diff line number Diff line
@@ -425,10 +425,10 @@ framework_docs_SDK_CURRENT_DIR:=$(framework_docs_SDK_VERSION)_r$(framework_docs_ 
framework_docs_SDK_PREVIEW:=0



## Latest ADT version identifiers, for reference from published docs

framework_docs_ADT_VERSION:=0.9.5

framework_docs_ADT_DOWNLOAD:=ADT-0.9.5.zip

framework_docs_ADT_BYTES:=3372982

framework_docs_ADT_CHECKSUM:=227ec538359fbe417ccde7f0ad614a96

framework_docs_ADT_VERSION:=0.9.6

framework_docs_ADT_DOWNLOAD:=ADT-0.9.6.zip

framework_docs_ADT_BYTES:=7456339

framework_docs_ADT_CHECKSUM:=ea45d271be52b87b5dd1c9fb17536223



framework_docs_LOCAL_DROIDDOC_OPTIONS += \

		-hdf sdk.version $(framework_docs_SDK_VERSION) \

api/current.xml

+358 −624

File changed.

Preview size limit exceeded, changes collapsed.

cmds/am/src/com/android/commands/am/Am.java

+48 −1

File changed.

Preview size limit exceeded, changes collapsed.

cmds/bmgr/src/com/android/commands/bmgr/Bmgr.java

+2 −2
Original line number Diff line number Diff line
@@ -278,8 +278,8 @@ public final class Bmgr { 
            System.out.println("restoreStarting: " + numPackages + " packages");

        }



        public void onUpdate(int nowBeingRestored) {

            System.out.println("onUpdate: " + nowBeingRestored);

        public void onUpdate(int nowBeingRestored, String currentPackage) {

            System.out.println("onUpdate: " + nowBeingRestored + " = " + currentPackage);

        }



        public void restoreFinished(int error) {

core/java/android/accounts/AccountManager.java

+34 −44

File changed.

Preview size limit exceeded, changes collapsed.