am d960df40: cherrypick 76bd108d from master. do not merge.

* commit 'd960df40f2c762c02cc2b47c53444b9b0f8374f1':
  cherrypick 76bd108d from master. do not merge.
This commit is contained in:
Raphael
2011-11-03 22:45:52 +00:00
committed by Android Git Automerger
7 changed files with 15 additions and 15 deletions

View File

@@ -1,5 +1,5 @@
Pkg.UserSrc=false Pkg.UserSrc=false
Pkg.Revision=1 Pkg.Revision=1
AndroidVersion.ApiLevel=14 AndroidVersion.ApiLevel=15
#AndroidVersion.CodeName= #AndroidVersion.CodeName=

View File

@@ -1,6 +1,6 @@
Pkg.Desc=Android SDK Platform 4.0 Pkg.Desc=Android SDK Platform 4.1
Pkg.UserSrc=false Pkg.UserSrc=false
Pkg.Revision=2 Pkg.Revision=1
AndroidVersion.ApiLevel=14 AndroidVersion.ApiLevel=15
#AndroidVersion.CodeName= #AndroidVersion.CodeName=
SystemImage.Abi=armeabi-v7a SystemImage.Abi=armeabi-v7a

View File

@@ -1,6 +1,6 @@
Pkg.Desc=Android SDK Platform 4.0 Pkg.Desc=Android SDK Platform 4.1
Pkg.UserSrc=false Pkg.UserSrc=false
Pkg.Revision=1 Pkg.Revision=1
AndroidVersion.ApiLevel=14 AndroidVersion.ApiLevel=15
#AndroidVersion.CodeName= #AndroidVersion.CodeName=
SystemImage.Abi=armeabi SystemImage.Abi=armeabi

View File

@@ -1,6 +1,6 @@
Pkg.Desc=Android SDK Platform 4.0 Pkg.Desc=Android SDK Platform 4.1
Pkg.UserSrc=false Pkg.UserSrc=false
Pkg.Revision=1 Pkg.Revision=1
AndroidVersion.ApiLevel=14 AndroidVersion.ApiLevel=15
#AndroidVersion.CodeName= #AndroidVersion.CodeName=
SystemImage.Abi=x86 SystemImage.Abi=x86

View File

@@ -1,9 +1,9 @@
Pkg.Desc=Android SDK Platform 4.0 Pkg.Desc=Android SDK Platform 4.1
Pkg.UserSrc=false Pkg.UserSrc=false
Platform.Version=4.0 Platform.Version=4.1
Pkg.Revision=2 Pkg.Revision=1
AndroidVersion.ApiLevel=14 AndroidVersion.ApiLevel=15
#AndroidVersion.CodeName= #AndroidVersion.CodeName=
Layoutlib.Api=7 Layoutlib.Api=7
Layoutlib.Revision=1 Layoutlib.Revision=1
Platform.MinToolsRev=14 Platform.MinToolsRev=15

View File

@@ -1,4 +1,4 @@
Pkg.UserSrc=false Pkg.UserSrc=false
Pkg.Revision=1 Pkg.Revision=1
AndroidVersion.ApiLevel=14 AndroidVersion.ApiLevel=15
#AndroidVersion.CodeName= #AndroidVersion.CodeName=

View File

@@ -1,4 +1,4 @@
Pkg.Revision=4 Pkg.Revision=5
Archive.Os=WINDOWS Archive.Os=WINDOWS
Archive.Arch=ANY Archive.Arch=ANY
Extra.Path=usb_driver Extra.Path=usb_driver