Commit Graph

7535 Commits

Author SHA1 Message Date
The Android Open Source Project 98ab33fa03 am b5acb8b4: am 070e712f: Reconcile with ics-mr0-release ics-factoryrom-2-release
* commit 'b5acb8b45904ae5cc17de847c4036d3f6146847c':
  ITL41G
  ICL53B
2011-11-23 10:34:27 -08:00
The Android Open Source Project b5acb8b459 am 070e712f: Reconcile with ics-mr0-release ics-factoryrom-2-release
* commit '070e712fb3037b28e81340eb2e4fb53d1539130d':
  ITL41G
  ICL53B
2011-11-23 09:24:44 -08:00
The Android Open Source Project 070e712fb3 Reconcile with ics-mr0-release ics-factoryrom-2-release
Change-Id: Ie10ba0ee48e3f7230c8613b63a6d9b1856b260c6
2011-11-23 09:23:46 -08:00
The Android Automerger 4e776f342a ITL41G 2011-11-22 21:50:14 -08:00
The Android Automerger 13315dd2ca ICL53B 2011-11-22 16:14:07 -08:00
The Android Automerger 28693b2b04 merge in ics-mr0-release history after reset to ics-mr0 2011-11-22 16:13:00 -08:00
The Android Open Source Project 6bf1b8a097 am 330875fd: am 24215999: Reconcile with ics-mr0-release
* commit '330875fdcf830db62a46ceb9bc0e0c3d9f67b775':
2011-11-22 15:28:03 -08:00
The Android Open Source Project 330875fdcf am 24215999: Reconcile with ics-mr0-release
* commit '24215999d0a9d603aeea3c88ceedfb8e36fcf947':
  ICL53
2011-11-22 15:26:13 -08:00
The Android Open Source Project 24215999d0 Reconcile with ics-mr0-release
Change-Id: I3797edc6648a93700423b6ad4fb50d2e36c62bfc
2011-11-22 15:23:59 -08:00
The Android Open Source Project 53343ec94d Reconcile with ics-mr0-release
Change-Id: Icd071d37f41bb60a49fd88195b433b95733da769
2011-11-22 15:15:38 -08:00
The Android Automerger 54aa08fdbb ICL53 2011-11-22 14:29:10 -08:00
The Android Automerger fee376bcd6 merge in ics-mr0-release history after reset to ics-mr0 2011-11-22 14:26:36 -08:00
The Android Open Source Project 33b2a9475d Reconcile with ics-mr1-release
Change-Id: If09ddcaa675b12a1d92a48f2c7ce7c315482f43f
2011-11-22 13:25:31 -08:00
The Android Open Source Project 8c58fcaaa0 am 43583c1a: am 5cd44bd3: Reconcile with ics-mr0-release ics-factoryrom-2-release
* commit '43583c1a4431d4c237a86ce2a65465706a4a5078':
  ITL41F
  ITL41E
  ICL52
  ICL49B
2011-11-22 13:24:05 -08:00
The Android Open Source Project 43583c1a44 am 5cd44bd3: Reconcile with ics-mr0-release ics-factoryrom-2-release
* commit '5cd44bd38f4d2158758a97e8a871a3b9cd6b6b37':
  ITL41F
  ITL41E
  ICL52
  ICL49B
2011-11-22 13:22:23 -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
Jean-Baptiste Queru 25f0158c18 am 6b95f9b0: Ignore version numbers from AOSP
* commit '6b95f9b002c819a35ce68ce930007618e2f30ff7':
  Restore AOSP-specific pseudo-version-numbers.
2011-11-22 12:42:02 -08:00
Jean-Baptiste Queru 6b95f9b002 Ignore version numbers from AOSP
Change-Id: I971716e56ec5649013ba50c6bb385329074be40b
2011-11-22 12:29:30 -08:00
Jean-Baptiste Queru d2cbcb40c0 Restore AOSP-specific pseudo-version-numbers.
For great justice.

Change-Id: I5a0f722419bff676142ce975a66225f0cd418ff8
2011-11-22 12:21:00 -08:00
The Android Automerger a96f6f55b8 IML52C 2011-11-22 12:02:47 -08:00
The Android Automerger 2f3d9f53dc IML53 2011-11-22 11:58:43 -08:00
The Android Automerger 41b9a903c2 merge in ics-mr1-release history after reset to ics-mr1 2011-11-22 11:55:18 -08:00
The Android Automerger 8f83247ceb IML52B 2011-11-21 19:29:29 -08:00
The Android Automerger 4509757007 IML52 2011-11-21 17:45:13 -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 d230518c09 am 5764dca0: (-s ours) am bb0e59be: resolved conflicts for merge of aca203ff to ics-mr1
* commit '5764dca053ac06e8e510b931e19bdc8f02caaccd':
  ICS MR0.1 will be version 4.0.2 - do not merge
2011-11-21 08:33:50 -08:00
Bart Sears 5764dca053 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:56 -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 d8d0c6345f am 14c2d2c1: am 1ca1730b: Reconcile with ics-mr0-release
* commit '14c2d2c1f77c0b4713cf406e941fbcb5d28bb90d':
2011-11-18 15:53:15 -08:00
The Android Open Source Project 14c2d2c1f7 am 1ca1730b: Reconcile with ics-mr0-release
* commit '1ca1730b88e45d39c9211793d133cae148b134a1':
  ICL49
2011-11-18 15:51:28 -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 Open Source Project 5e382ebe6e Reconcile with ics-mr0-release ics-mr1-release
Change-Id: Ib84343e699b17901f70c9f1f2498027dba4be020
2011-11-18 15:42:18 -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
Jeff Hamilton 86624bf608 Merge "Bypass alias for grep in the tapas command." 2011-11-18 15:30:34 -08:00
Jeff Hamilton 293f9392ba Bypass alias for grep in the tapas command.
Change-Id: I82705535bda927ddc7e9aebb9610d712b68a50d2
2011-11-18 17:24:13 -06:00
The Android Open Source Project df4a4284eb am 2e29da19: am 409670e9: Reconcile with ics-mr0-release
* commit '2e29da1995e465cdbfba024528fa2395644673ce':
  ICL48B
2011-11-18 15:23:13 -08:00
Svetoslav Ganov cbd4821b0a am ecca008c: am 700b18cc: Merge "Add the support libraries to the platform documentation (build)." into ics-mr1
* commit 'ecca008c17c0f74a749289e23f8606f1b92930f6':
  Add the support libraries to the platform documentation (build).
2011-11-18 15:22:34 -08:00
Jing Yu 877bddc604 Merge "Workaround for a gcc-4.6 bug on -fstrict-volatile-bitfields." 2011-11-18 14:34:53 -08:00
Jing Yu 7bf82e0171 Workaround for a gcc-4.6 bug on -fstrict-volatile-bitfields.
http://gcc.gnu.org/ml/gcc-patches/2011-03/msg01477.html
http://gcc.gnu.org/ml/gcc-patches/2011-11/msg01390.html

-fstrict-volatile-bitfields is set on by default on gcc-4.6
for ARM target. This causes an inline asm() error. While
upstream gcc community is working on the patch, we shut
off this option temporarily.

This patch does not affect gcc-4.4.3 build.

Change-Id: Id7016dc5856a516e10f2617232945034728a74ab
2011-11-18 14:22:55 -08:00
The Android Open Source Project 2e29da1995 am 409670e9: Reconcile with ics-mr0-release
* commit '409670e9fa4131bed57a292b3a25180e4ac0709e':
  ICL48B
2011-11-18 13:35:29 -08:00
The Android Open Source Project 409670e9fa Reconcile with ics-mr0-release
Change-Id: I1a7eeaede99ffa7bb7f38ee419704ab9d1f2d834
2011-11-18 13:12:21 -08:00
The Android Automerger 1b87ad32c3 IML48C 2011-11-18 12:45:55 -08:00
Svetoslav Ganov ecca008c17 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:14:02 -08:00