From d960df40f2c762c02cc2b47c53444b9b0f8374f1 Mon Sep 17 00:00:00 2001
From: Raphael <raphael@google.com>
Date: Wed, 2 Nov 2011 21:50:42 -0700
Subject: [PATCH] cherrypick 76bd108d from master. do not merge.

Change-Id: Ibb677f286b54a9dd593301a0f8b194d3b2dc58d1
SDK: update SDK to API 15
---
 sdk/doc_source.properties                |  2 +-
 sdk/images_armeabi-v7a_source.properties |  6 +++---
 sdk/images_armeabi_source.properties     |  4 ++--
 sdk/images_x86_source.properties         |  4 ++--
 sdk/platform_source.properties           | 10 +++++-----
 sdk/source_source.properties             |  2 +-
 sdk/usbdriver_source.properties          |  2 +-
 7 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/sdk/doc_source.properties b/sdk/doc_source.properties
index acf5d3b95..5b3dce6e3 100644
--- a/sdk/doc_source.properties
+++ b/sdk/doc_source.properties
@@ -1,5 +1,5 @@
 Pkg.UserSrc=false
 Pkg.Revision=1
-AndroidVersion.ApiLevel=14
+AndroidVersion.ApiLevel=15
 #AndroidVersion.CodeName=
 
diff --git a/sdk/images_armeabi-v7a_source.properties b/sdk/images_armeabi-v7a_source.properties
index 9499576f1..9280fdda3 100644
--- a/sdk/images_armeabi-v7a_source.properties
+++ b/sdk/images_armeabi-v7a_source.properties
@@ -1,6 +1,6 @@
-Pkg.Desc=Android SDK Platform 4.0
+Pkg.Desc=Android SDK Platform 4.1
 Pkg.UserSrc=false
-Pkg.Revision=2
-AndroidVersion.ApiLevel=14
+Pkg.Revision=1
+AndroidVersion.ApiLevel=15
 #AndroidVersion.CodeName=
 SystemImage.Abi=armeabi-v7a
diff --git a/sdk/images_armeabi_source.properties b/sdk/images_armeabi_source.properties
index 192ecde69..63fc67726 100644
--- a/sdk/images_armeabi_source.properties
+++ b/sdk/images_armeabi_source.properties
@@ -1,6 +1,6 @@
-Pkg.Desc=Android SDK Platform 4.0
+Pkg.Desc=Android SDK Platform 4.1
 Pkg.UserSrc=false
 Pkg.Revision=1
-AndroidVersion.ApiLevel=14
+AndroidVersion.ApiLevel=15
 #AndroidVersion.CodeName=
 SystemImage.Abi=armeabi
diff --git a/sdk/images_x86_source.properties b/sdk/images_x86_source.properties
index caccb2d78..bb825778e 100644
--- a/sdk/images_x86_source.properties
+++ b/sdk/images_x86_source.properties
@@ -1,6 +1,6 @@
-Pkg.Desc=Android SDK Platform 4.0
+Pkg.Desc=Android SDK Platform 4.1
 Pkg.UserSrc=false
 Pkg.Revision=1
-AndroidVersion.ApiLevel=14
+AndroidVersion.ApiLevel=15
 #AndroidVersion.CodeName=
 SystemImage.Abi=x86
diff --git a/sdk/platform_source.properties b/sdk/platform_source.properties
index 54fa9ff7c..0e70356e8 100644
--- a/sdk/platform_source.properties
+++ b/sdk/platform_source.properties
@@ -1,9 +1,9 @@
-Pkg.Desc=Android SDK Platform 4.0
+Pkg.Desc=Android SDK Platform 4.1
 Pkg.UserSrc=false
-Platform.Version=4.0
-Pkg.Revision=2
-AndroidVersion.ApiLevel=14
+Platform.Version=4.1
+Pkg.Revision=1
+AndroidVersion.ApiLevel=15
 #AndroidVersion.CodeName=
 Layoutlib.Api=7
 Layoutlib.Revision=1
-Platform.MinToolsRev=14
+Platform.MinToolsRev=15
diff --git a/sdk/source_source.properties b/sdk/source_source.properties
index 7cb1d33df..d0b390b1d 100644
--- a/sdk/source_source.properties
+++ b/sdk/source_source.properties
@@ -1,4 +1,4 @@
 Pkg.UserSrc=false
 Pkg.Revision=1
-AndroidVersion.ApiLevel=14
+AndroidVersion.ApiLevel=15
 #AndroidVersion.CodeName=
diff --git a/sdk/usbdriver_source.properties b/sdk/usbdriver_source.properties
index 3f9484b3d..c55310ed0 100755
--- a/sdk/usbdriver_source.properties
+++ b/sdk/usbdriver_source.properties
@@ -1,4 +1,4 @@
-Pkg.Revision=4
+Pkg.Revision=5
 Archive.Os=WINDOWS
 Archive.Arch=ANY
 Extra.Path=usb_driver