Commit graph

7309 commits

Author SHA1 Message Date
Raphael
1985846eb0 Merge "SDK: pass $HOST_OUT variable to atree." 2011-11-16 14:19:11 -08:00
The Android Open Source Project
8f71b5e963 am 9ea9ee16: am 44d7d24f: No-op merge from ics-mr0
* commit '9ea9ee16eb446dd9ea54ce9bd74689c965c4920f':
2011-11-16 09:15:04 -08:00
The Android Open Source Project
9ea9ee16eb am 44d7d24f: No-op merge from ics-mr0
* commit '44d7d24f97f7de13a490ec3279f07e7af7bb98a5':
2011-11-16 09:13:28 -08:00
The Android Open Source Project
44d7d24f97 No-op merge from ics-mr0
Change-Id: Ibbdd04c5626976293b9e6170e9e1f844cb6582a5
2011-11-16 09:10:38 -08:00
The Android Open Source Project
7f3c884831 Reconcile with ics-factoryrom-2-release
Change-Id: I2059be2fb54d852023cb4e4b96493ff6a934ffe0
2011-11-16 08:55:32 -08:00
The Android Open Source Project
b50944b427 am 79ed1f54: am 88eff0cb: Reconcile with ics-mr0-release ics-factoryrom-2-release
* commit '79ed1f549f643cef906fb3dc5ccc09edfe0fd36c':
  ICL47
  ICL46B
  ICL46
  ICL45B
  ICL45
  ICL44
  ITL41D
  ICL42C
  ICL42B
  ICL42
  ITL41C
  ITL41B
  ITL41
2011-11-16 07:42:07 -08:00
The Android Open Source Project
79ed1f549f am 88eff0cb: Reconcile with ics-mr0-release ics-factoryrom-2-release
* commit '88eff0cb509bdd824c542b52880d9e93db4444a0':
  ICL47
  ICL46B
  ICL46
  ICL45B
  ICL45
  ICL44
  ITL41D
  ICL42C
  ICL42B
  ICL42
  ITL41C
  ITL41B
  ITL41
  ICL41
2011-11-16 07:38:07 -08:00
The Android Open Source Project
88eff0cb50 Reconcile with ics-mr0-release ics-factoryrom-2-release
Change-Id: I76232373a2c25c0e18c27672ede2bb1b281e43f6
2011-11-16 07:33:52 -08:00
The Android Automerger
d8766c3d6e ICL47 2011-11-16 06:28:22 -08:00
The Android Automerger
46c66ab46a merge in ics-mr0-release history after reset to ics-mr0 2011-11-16 06:27:06 -08:00
The Android Automerger
7dcfa668a7 ICL46B 2011-11-15 19:09:18 -08:00
The Android Automerger
c6439d28c1 merge in ics-mr0-release history after reset to ics-mr0 2011-11-15 19:07:30 -08:00
Raphael
2a533178c1 SDK: pass $HOST_OUT variable to atree.
Required by Change Id623bbef45 in development.git

Change-Id: I43229f1e6aaeea176df92a499b9cda3237fb36b9
2011-11-15 16:32:42 -08:00
The Android Automerger
0563a19318 ICL46 2011-11-15 06:28:19 -08:00
The Android Automerger
6ab63c9b16 merge in ics-mr0-release history after reset to ics-mr0 2011-11-15 06:27:08 -08:00
The Android Automerger
6a27292496 ICL45B 2011-11-14 17:14:35 -08:00
The Android Automerger
74bcbe8a9f merge in ics-mr0-release history after reset to ics-mr0 2011-11-14 17:10:28 -08:00
Dianne Hackborn
227b9f8b9b Merge "Dev branch for ICS MR2." 2011-11-14 13:14:25 -08:00
The Android Automerger
433c4aa93a ICL45 2011-11-14 06:28:30 -08:00
The Android Automerger
a3cb1e2f40 merge in ics-mr0-release history after reset to ics-mr0 2011-11-14 06:27:06 -08:00
The Android Automerger
53bd4f9ea4 ICL44 2011-11-13 06:28:49 -08:00
The Android Automerger
cbb636dd6c merge in ics-mr0-release history after reset to ics-mr0 2011-11-13 06:27:17 -08:00
Erik Gilling
9b856464ce am fea7a4d4: Merge branch \'ics-mr1-plus-aosp\' of ssh://android-git:29418/platform/build into ics-mr1-plus-aosp
* commit 'fea7a4d44cda8a9bb9bbf7ec53760a985e114f64':
2011-11-11 20:36:59 -08:00
Doug Zongker
402839d17a am 29ea81eb: am 4a84a13e: am a5f534df: use frozensets to represent APK cert sets
* commit '29ea81eb977699a2b026f08d13f213a7d216cb7e':
  use frozensets to represent APK cert sets
2011-11-11 20:36:58 -08:00
Erik Gilling
fea7a4d44c Merge branch 'ics-mr1-plus-aosp' of ssh://android-git:29418/platform/build into ics-mr1-plus-aosp 2011-11-11 20:35:06 -08:00
Doug Zongker
29ea81eb97 am 4a84a13e: am a5f534df: use frozensets to represent APK cert sets
* commit '4a84a13e7ce65f24bcadb8d331023b6415d7867e':
  use frozensets to represent APK cert sets
2011-11-11 20:34:47 -08:00
Jean-Baptiste Queru
02f5e8df68 am 1623f79c: Merge from ics-mr0
* commit '1623f79c7561b19f57c10ac303f6246deee7c634':
  use frozensets to represent APK cert sets
2011-11-11 20:34:37 -08:00
Jean-Baptiste Queru
1623f79c75 Merge from ics-mr0
Change-Id: I5667c315fab589a2dc39e000a81397d317691895
2011-11-11 19:47:47 -08:00
Doug Zongker
4a84a13e7c am a5f534df: use frozensets to represent APK cert sets
* commit 'a5f534df07a598f3fc9d353a1a9a0ff6c09cfbc0':
  use frozensets to represent APK cert sets
2011-11-11 19:17:24 -08:00
The Android Automerger
a5158b31d9 ITL41D 2011-11-11 19:08:23 -08:00
The Android Automerger
6826c2b159 ICL42C 2011-11-11 18:47:45 -08:00
The Android Automerger
11a0b04ae6 ICL42B 2011-11-11 18:33:07 -08:00
The Android Open Source Project
e446160ae1 am 4115aeae: am 324c814c: Merge from AOSP
* commit '4115aeaef30cc2f13abc4a1e4165995909fa3098':
  Add a hash-bang as the first line of a shell script
2011-11-11 16:07:31 -08:00
The Android Open Source Project
4115aeaef3 am 324c814c: Merge from AOSP
* commit '324c814c6f479bb33eb8aa05d221c8a44b8f61b9':
  Add a hash-bang as the first line of a shell script
2011-11-11 16:06:02 -08:00
The Android Open Source Project
324c814c6f Merge from AOSP
Change-Id: Ie444a93a1fcba693332d302de828bdc62fd61647
2011-11-11 16:03:56 -08:00
The Android Automerger
07e699f9f2 ICL42 2011-11-11 14:47:46 -08:00
The Android Automerger
63dd3748e7 merge in ics-mr0-release history after reset to ics-mr0 2011-11-11 14:45:37 -08:00
Ying Wang
7deff5fc54 am bb5ada52: am a032d3d0: Support for multiple PRODUCT_SDK_ADDON_DOC_MODULES
* commit 'bb5ada524c3c15132c832e076104d44ca7dde5ad':
  Support for multiple PRODUCT_SDK_ADDON_DOC_MODULES
2011-11-11 14:38:14 -08:00
Jean-Baptiste Queru
f9b556cd51 Add a hash-bang as the first line of a shell script
Change-Id: I5b663b036ecb25e952ecd2d998971cc326d4ebdf
2011-11-11 14:37:31 -08:00
Ying Wang
bb5ada524c am a032d3d0: Support for multiple PRODUCT_SDK_ADDON_DOC_MODULES
* commit 'a032d3d07372423176e072dfcbcf60a53f8a7d57':
  Support for multiple PRODUCT_SDK_ADDON_DOC_MODULES
2011-11-11 14:36:39 -08:00
The Android Open Source Project
9ff0549621 am 19d01ee6: am 600298c0: Merge from ics-mr0
* commit '19d01ee6bff124e0d963d1eb3a63db3ab8008baa':
2011-11-11 11:50:55 -08:00
The Android Open Source Project
19d01ee6bf am 600298c0: Merge from ics-mr0
* commit '600298c0baf773030d726f3a18bc543af98e13d4':
2011-11-11 11:47:50 -08:00
Nick Kralevich
32a3e84f4d Merge "make gdbclient work on x86" 2011-11-11 11:43:11 -08:00
Ying Wang
a032d3d073 Support for multiple PRODUCT_SDK_ADDON_DOC_MODULES
Bug: 5429077
Change-Id: I8d962c803496479ba5b5e7316538aced65ee4df1
2011-11-11 10:52:12 -08:00
Doug Zongker
a5f534df07 use frozensets to represent APK cert sets
Change-Id: Ic92c83be0c3f6a76bf1bd21f0216cd1b87586959
2011-11-11 09:51:37 -08:00
Nick Kralevich
0ab21d3ed3 make gdbclient work on x86
Change-Id: I2fd4fc2b89db13a8db1b177afdab593772cb12f8
2011-11-11 09:02:01 -08:00
The Android Automerger
cf8caa89fd ITL41C 2011-11-10 23:41:40 -08:00
The Android Open Source Project
600298c0ba Merge from ics-mr0
Change-Id: I759452c031b9e2f02905dd488b61f100e3eaa87a
2011-11-10 18:26:45 -08:00
The Android Automerger
b4da2d16c7 ITL41B 2011-11-10 17:27:13 -08:00
The Android Automerger
81fd27b46e ITL41 2011-11-10 17:22:24 -08:00