Commit Graph

6329 Commits

Author SHA1 Message Date
The Android Automerger
058329ea42 HLJ56
Change-Id: I33b1326c2a189c55168a4afb09cda2ec5abeac99
2011-05-26 06:09:34 -07:00
The Android Automerger
607f24717a merge in honeycomb-LTE-release history after reset to honeycomb-LTE 2011-05-26 06:09:27 -07:00
The Android Automerger
9e7de6792f GRJ55
Change-Id: Ie75ba136457e19223f1a0ca3be7dba1379e9f20f
2011-05-25 16:14:27 -07:00
The Android Automerger
549e275ce3 merge in gingerbread-release history after reset to gingerbread 2011-05-25 16:13:53 -07:00
The Android Automerger
fdb5a74d2e HTJ55
Change-Id: Ie9115674c0f9a5868c86bc684f7a28b8163da2b8
2011-05-25 07:09:43 -07:00
The Android Automerger
bcbc87e78e merge in honeycomb-mr2-release history after reset to honeycomb-mr2 2011-05-25 07:09:27 -07:00
The Android Automerger
6f6b6fa64a HLJ55
Change-Id: Iff92d9105853f7a18b7bc4ff50d8f06517bc6d39
2011-05-25 06:01:21 -07:00
The Android Automerger
a01ade8281 merge in honeycomb-LTE-release history after reset to honeycomb-LTE 2011-05-25 06:01:17 -07:00
David Turner
4272b32a86 Merge "Clean up of X86 build flags" 2011-05-24 22:58:20 -07:00
The Android Automerger
a5e01e4aed HLJ54B
Change-Id: Id40ace30bafcf76df8cd9c904d99b8ba8cc22bba
2011-05-24 22:13:30 -07:00
The Android Automerger
2d0330143f merge in honeycomb-LTE-release history after reset to honeycomb-LTE 2011-05-24 22:13:22 -07:00
Ying Wang
bd08b7e415 Merge "Fix use of intermediates in droiddoc" 2011-05-24 16:27:29 -07:00
Ying Wang
053dccb159 Relax the constraint of 64bit build environment.
Change-Id: Id8be221dcfa07651a4d9a2776b00e907b4ff750e
2011-05-24 15:46:15 -07:00
The Android Automerger
0ffde50d4f HTJ54B
Change-Id: Ida22b6847b1754a41435fef451c83930ccdcbc29
2011-05-24 12:35:57 -07:00
The Android Automerger
0d804e6a0f HTJ54
Change-Id: If2f887ed2b0db4b233824109ec7f5dd1c25f8709
2011-05-24 07:09:42 -07:00
The Android Automerger
93c7377c6b merge in honeycomb-mr2-release history after reset to honeycomb-mr2 2011-05-24 07:09:36 -07:00
The Android Automerger
9c6a706c38 HLJ54
Change-Id: I388a3dcc67eb41e33ec59b45fec3479c7c1e249b
2011-05-24 06:11:44 -07:00
The Android Automerger
e0baf6d934 merge in honeycomb-LTE-release history after reset to honeycomb-LTE 2011-05-24 06:11:31 -07:00
The Android Automerger
7e314eb808 HTJ53B
Change-Id: I4130fdccb922cf0a11e6c4a61cc87f974f6ef9c6
2011-05-23 14:50:13 -07:00
The Android Automerger
a3f0d8703e HTJ53
Change-Id: I4f136f662bde95cba9106f17ca108fdcf6a8526c
2011-05-23 07:09:14 -07:00
The Android Automerger
a41e8c8f02 merge in honeycomb-mr2-release history after reset to honeycomb-mr2 2011-05-23 07:09:03 -07:00
The Android Automerger
4209ce6dbb HLJ53
Change-Id: I4c5b0bb524939a76ee08bfb45184a944285e8f38
2011-05-23 06:08:13 -07:00
The Android Automerger
d81192d795 merge in honeycomb-LTE-release history after reset to honeycomb-LTE 2011-05-23 06:08:07 -07:00
The Android Automerger
002f129ce7 HLJ52
Change-Id: I1a35423d3ba9ef70a54f2bd2b80a241d3b66ea82
2011-05-22 09:46:54 -07:00
The Android Automerger
385e2004c2 merge in honeycomb-LTE-release history after reset to honeycomb-LTE 2011-05-22 09:46:40 -07:00
The Android Automerger
3f597e78d7 HLJ51
Change-Id: I0a01cc7d5657947a920a1457bbbb85a9ee2dfd83
2011-05-21 16:30:58 -07:00
The Android Automerger
bafbf2a75d merge in honeycomb-LTE-release history after reset to honeycomb-LTE 2011-05-21 16:30:47 -07:00
The Android Automerger
69197c196f HTJ50B
Change-Id: If94fd99c40573e9d0ed8cf4fc087275c24bfb03e
2011-05-20 14:28:01 -07:00
The Android Automerger
0c75ad4ea8 merge in honeycomb-mr2-release history after reset to honeycomb-mr2 2011-05-20 14:27:53 -07:00
The Android Open Source Project
ca8cd5bdc3 Reconcile with gingerbread-release honeycomb-release honeycomb-mr1-release honeycomb-mr2-release honeycomb-LTE-release
Change-Id: Ieee6a3fece693ded9f20f8c94f1dcf2cc672072b
2011-05-20 14:23:31 -07:00
Jean-Baptiste Queru
61a211eec6 Merge "Switch to mksh as the default shell." 2011-05-20 10:59:47 -07:00
The Android Automerger
8183c40691 HTJ50
Change-Id: I3db4ee9078094fe2ca1bdcee52b7c34e4efb8d85
2011-05-20 07:09:02 -07:00
The Android Automerger
b2fb7b071b merge in honeycomb-mr2-release history after reset to honeycomb-mr2 2011-05-20 07:08:58 -07:00
The Android Automerger
464482e203 HLJ50
Change-Id: If575aa28cb80a3490a49d9e22222eb8eb3e62ae5
2011-05-20 06:09:45 -07:00
The Android Automerger
9536280da6 merge in honeycomb-LTE-release history after reset to honeycomb-LTE 2011-05-20 06:09:40 -07:00
Jean-Baptiste Queru
db773fb584 am cdef4045: (-s ours) Merge 5d66a07d - do not merge
* commit 'cdef404572a71ea320f59643c52143764bd590fe':
  Use actual numbers in version numbers.
2011-05-19 15:17:21 -07:00
Jean-Baptiste Queru
cdef404572 Merge 5d66a07d - do not merge
Change-Id: I787a6d5d5c79e7122ed506cd6d9e373e7d1049f4
2011-05-19 14:30:26 -07:00
Jean-Baptiste Queru
5d66a07d44 Merge "Use actual numbers in version numbers." 2011-05-19 13:57:00 -07:00
The Android Automerger
148ff14b74 HTJ49
Change-Id: I1178be6de8832ff8febc6e466f4b4b3a92d487da
2011-05-19 07:08:43 -07:00
The Android Automerger
436265f995 merge in honeycomb-mr2-release history after reset to honeycomb-mr2 2011-05-19 07:08:38 -07:00
The Android Automerger
4c41e58639 HLJ49
Change-Id: I718a1b761026950ac1712f18f39c4d219e1d20e0
2011-05-19 06:08:38 -07:00
The Android Automerger
10f1e3a88b merge in honeycomb-LTE-release history after reset to honeycomb-LTE 2011-05-19 06:08:33 -07:00
Mark D Horn
5812d7b469 Clean up of X86 build flags
Review and clean-up of both compiler and linker flags
to ensure proper usage and consistency for images, toolchain,
SDK, and NDK.

Change-Id: Ife75c32cd49b32345712dee28fa5f2283069a90e
Signed-off-by: Mark D Horn <mark.d.horn@intel.com>
Author: Bruce Beare <bruce.j.beare@intel.com>
2011-05-18 14:10:58 -07:00
Jean-Baptiste Queru
772a0f6794 Switch to mksh as the default shell.
Switch the emulator builds to ash to make sure it still
works, in case we find that we need to go back to using ash.

Change-Id: Id5641940b63cc4225011be1c375f4c86ec4d21cc
2011-05-18 13:49:08 -07:00
The Android Automerger
3c92b71cfd HTJ48
Change-Id: I1f032567bfd8c8e07c39cfd3be7ea296076903b6
2011-05-18 07:09:16 -07:00
The Android Automerger
8fa682bd10 merge in honeycomb-mr2-release history after reset to honeycomb-mr2 2011-05-18 07:09:12 -07:00
The Android Automerger
aeb5d4aa87 HLJ48
Change-Id: Id99ec7468fec0cdfb83037ae04402171095cd7ea
2011-05-18 06:09:56 -07:00
The Android Automerger
9075818851 merge in honeycomb-LTE-release history after reset to honeycomb-LTE 2011-05-18 06:09:49 -07:00
Ying Wang
fb790877a0 Fix use of intermediates in droiddoc
Droiddoc should be product-independent.

Change-Id: I23ac746330ce7cd0ad47d49c01dcfa824228d60c
2011-05-17 16:13:47 -07:00
The Android Automerger
343c99bf4e HTJ47
Change-Id: I6ff5d200c839b8478f0f68e80d5a9e153356be9b
2011-05-17 07:08:46 -07:00