Commit Graph

7003 Commits

Author SHA1 Message Date
The Android Open Source Project 0cb84051fc am 5cd44bd3: Reconcile with ics-mr0-release ics-factoryrom-2-release
* commit '5cd44bd38f4d2158758a97e8a871a3b9cd6b6b37':
  ITL41F
  ITL41E
  ICL52
  ICL49B
2011-11-22 13:22:34 -08:00
The Android Open Source Project 5cd44bd38f Reconcile with ics-mr0-release ics-factoryrom-2-release
Change-Id: Ie25ab898e849e7d52c08796cd7f1bea6f12d6bd1
2011-11-22 13:19:59 -08:00
The Android Automerger 3538ad9af2 ITL41F 2011-11-21 17:40:35 -08:00
The Android Automerger eb3f2c1c08 ITL41E 2011-11-21 13:41:52 -08:00
The Android Automerger 0d2a077ab0 ICL52 2011-11-21 13:08:17 -08:00
The Android Automerger 104cca7377 merge in ics-mr0-release history after reset to ics-mr0 2011-11-21 13:06:53 -08:00
Bart Sears 66c34a4dd7 am bb0e59be: resolved conflicts for merge of aca203ff to ics-mr1
* commit 'bb0e59be7c01fd9eb85d81b92c0527bac5402d1d':
  ICS MR0.1 will be version 4.0.2 - do not merge
2011-11-21 08:31:50 -08:00
Bart Sears bb0e59be7c resolved conflicts for merge of aca203ff to ics-mr1
Change-Id: Ib073a84132feb8eacaeb5af45ffa504102165149
2011-11-20 21:11:32 -08:00
Bart Sears aca203ffb6 ICS MR0.1 will be version 4.0.2 - do not merge
Change-Id: I35db6befcdfc421da8eb959285e61856c7ed2826
2011-11-19 17:52:21 -08:00
The Android Automerger 886cfbff0e ICL49B 2011-11-18 22:02:22 -08:00
The Android Automerger ca93af6ab1 merge in ics-mr0-release history after reset to ics-mr0 2011-11-18 22:00:45 -08:00
The Android Open Source Project 1971627ed0 am 1ca1730b: Reconcile with ics-mr0-release
* commit '1ca1730b88e45d39c9211793d133cae148b134a1':
  ICL49
2011-11-18 15:51:12 -08:00
The Android Open Source Project 1ca1730b88 Reconcile with ics-mr0-release
Change-Id: I134c060024841405d83b92a700bfe05aeb5d86b5
2011-11-18 15:49:35 -08:00
The Android Automerger 4c38d0cc8f ICL49 2011-11-18 15:38:37 -08:00
The Android Automerger 2cec7c9554 merge in ics-mr0-release history after reset to ics-mr0 2011-11-18 15:36:30 -08:00
The Android Open Source Project 9fde52a139 am 409670e9: Reconcile with ics-mr0-release
* commit '409670e9fa4131bed57a292b3a25180e4ac0709e':
  ICL48B
2011-11-18 13:14:14 -08:00
The Android Open Source Project 409670e9fa Reconcile with ics-mr0-release
Change-Id: I1a7eeaede99ffa7bb7f38ee419704ab9d1f2d834
2011-11-18 13:12:21 -08:00
Svetoslav Ganov a4c1256fca am 700b18cc: Merge "Add the support libraries to the platform documentation (build)." into ics-mr1
* commit '700b18cc72e75737fa5cf79896c98f12003b7735':
  Add the support libraries to the platform documentation (build).
2011-11-18 10:13:49 -08:00
Svetoslav Ganov 700b18cc72 Merge "Add the support libraries to the platform documentation (build)." into ics-mr1 2011-11-18 10:11:28 -08:00
The Android Automerger 03fa097654 ICL48B 2011-11-17 17:50:39 -08:00
The Android Automerger ab2931ed87 merge in ics-mr0-release history after reset to ics-mr0 2011-11-17 17:47:41 -08:00
The Android Open Source Project 4691a0155d am 77b2771b: Reconcile with ics-mr0-release
* commit '77b2771bd2bc26aefdf9ff3a3d96b54799185917':
  ICL48
2011-11-17 16:03:53 -08:00
The Android Open Source Project 77b2771bd2 Reconcile with ics-mr0-release
Change-Id: I42fcd347d98058118f225dedd011cb2fac76bbb6
2011-11-17 15:36:45 -08:00
Svetoslav Ganov 155d855cee Add the support libraries to the platform documentation (build).
Added path to the support libraries.

bug: 5629339

Change-Id: Id414597046c528617313881ea857134512d1c2ba
2011-11-17 15:13:56 -08:00
The Android Automerger 4d68222658 ICL48 2011-11-17 06:29:27 -08:00
The Android Automerger 0cd5c97949 merge in ics-mr0-release history after reset to ics-mr0 2011-11-17 06:27:12 -08:00
Ying Wang c48696770f Remove BUILT_TESTS_ZIP_PACKAGE's dependency on the image files
Change-Id: I99baaeffe099e8fbb9789fb01b26a9a563e1e90d
2011-11-16 11:56:30 -08:00
Ying Wang c6e952fec1 Don't build userdata.img for tests build.
Change-Id: I2982223919267f7b98f47b002c435e443674729a
2011-11-16 11:12:41 -08:00
The Android Open Source Project c20c683bac am 44d7d24f: No-op merge from ics-mr0
* commit '44d7d24f97f7de13a490ec3279f07e7af7bb98a5':
2011-11-16 09:13:36 -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 c500037a78 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:39 -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
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
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
Doug Zongker 1a16f33779 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:28 -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