Commit graph

7418 commits

Author SHA1 Message Date
The Android Open Source Project
cd197842b6 Reconcile with ics-mr1-release
Change-Id: I623e25d55ed00b150729425f710ca52af2de7913
2011-12-12 06:50:16 -08:00
The Android Automerger
00d48ec3e0 IML70C 2011-12-10 21:35:46 -08:00
Bruce Beare
381581613a am 3343b27c: x86: The default ATOM BSP flags need to be in sync with the NDK ABI
* commit '3343b27c534fb4ea238f2feaa0d9346840ee2f92':
  x86: The default ATOM BSP flags need to be in sync with the NDK ABI
2011-12-09 16:21:00 -08:00
The Android Automerger
7578d7e58c IML70B 2011-12-09 16:19:55 -08:00
The Android Automerger
63138065da merge in ics-mr1-release history after reset to ics-mr1 2011-12-09 16:15:20 -08:00
Bruce Beare
3343b27c53 x86: The default ATOM BSP flags need to be in sync with the NDK ABI
Change-Id: Ic741e1795c655ace1e33ae6708219f2708358090
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2011-12-09 13:27:08 -08:00
The Android Open Source Project
e7a33465ac Reconcile with ics-mr1-release
Change-Id: I7267a0f90aad28d4698b6c7ebd0e69e9dcd6ade6
2011-12-09 07:10:41 -08:00
The Android Automerger
5df6892ebd IML70 2011-12-09 06:59:51 -08:00
The Android Automerger
d83ef16e65 merge in ics-mr1-release history after reset to ics-mr1 2011-12-09 06:57:15 -08:00
The Android Automerger
3c1e3b648d IML69C 2011-12-08 17:37:41 -08:00
The Android Automerger
e513ee2462 merge in ics-mr1-release history after reset to ics-mr1 2011-12-08 17:34:09 -08:00
The Android Automerger
fd9df82adf IML69B 2011-12-08 11:30:49 -08:00
The Android Open Source Project
424e8787c9 am 91789538: Reconcile with ics-mr0-release
* commit '917895384fb7c9fb9ca858fdf792ec165e151de9':
2011-12-08 10:27:13 -08:00
The Android Open Source Project
917895384f Reconcile with ics-mr0-release
Change-Id: I7b413162b41b52be626b4ebc5c3f3ea37fdc6288
2011-12-08 10:25:56 -08:00
The Android Open Source Project
374011a72e Reconcile with ics-mr0-release ics-mr1-release
Change-Id: I7bc70364e017d1c67bcc4b308e0aff5eaa19e661
2011-12-08 10:21:25 -08:00
The Android Automerger
91158c9b5e IML69 2011-12-08 07:03:55 -08:00
The Android Automerger
c3c0dfb891 merge in ics-mr1-release history after reset to ics-mr1 2011-12-08 06:59:23 -08:00
The Android Automerger
69dbcc9ad7 ICL53F 2011-12-07 16:42:26 -08:00
The Android Automerger
dcd0084bfc IML67B 2011-12-07 11:15:49 -08:00
Dianne Hackborn
d7b15982d2 am e73b24cc: Did I say 4.1? Oh well what I *really* meant was 4.0.3, of course.
* commit 'e73b24ccbe728476e5bc77aaf2fd6865276cacc3':
  Did I say 4.1?  Oh well what I *really* meant was 4.0.3, of course.
2011-12-07 10:34:21 -08:00
Dianne Hackborn
e73b24ccbe Did I say 4.1? Oh well what I *really* meant was 4.0.3, of course.
Change-Id: I61ccc290aec8fa7e2e68cf01bc920a65b8b9e246
2011-12-07 10:30:19 -08:00
The Android Open Source Project
e3bdf69cc6 am febd861a: Reconcile with ics-mr0-release
* commit 'febd861a073b0500b6e7f0ea117b71df3bc6822c':
  ICL53E
2011-12-07 07:26:16 -08:00
The Android Open Source Project
febd861a07 Reconcile with ics-mr0-release
Change-Id: Ifdc1b145e1f778260a1445c954ea2e7848e67c19
2011-12-07 07:24:51 -08:00
Jean-Baptiste Queru
0cd997ff31 am 8af0efd6: Improve handling of absolute paths in out directory
* commit '8af0efd6a157e682d88c9a6e030f37bab9860caf':
  Improve handling of absolute paths in out directory
2011-12-06 19:32:38 -08:00
Jean-Baptiste Queru
78b680458b am ffe03c98: Set OUT_DIR based on a common base path
* commit 'ffe03c984b2836a9b4e4ddb5a17ec0dd26ba686c':
  Set OUT_DIR based on a common base path
2011-12-06 19:32:37 -08:00
The Android Automerger
43e70ba73e IML67 2011-12-06 16:56:46 -08:00
The Android Automerger
4d0b2f24b2 merge in ics-mr1-release history after reset to ics-mr1 2011-12-06 16:53:04 -08:00
Jean-Baptiste Queru
8af0efd6a1 Improve handling of absolute paths in out directory
Change-Id: If6b320e274fb1cee33808424246ce2c88b9b7ef5
2011-12-06 16:33:11 -08:00
Jean-Baptiste Queru
ffe03c984b Set OUT_DIR based on a common base path
Change-Id: I2c4ba8b101d4d186ed4b371b9d07b3bcf75bbcc9
Author: Jean-Baptiste Queru<jbq@google.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2011-12-06 14:36:49 -08:00
The Android Automerger
95cc5765a8 ICL53E 2011-12-06 14:23:43 -08:00
The Android Open Source Project
da4a1fc216 am aac7b445: Reconcile with ics-mr0-release
* commit 'aac7b4455a4dbfab5a136628864789eba8a31bb0':
  ICL53D
2011-12-06 08:57:52 -08:00
The Android Open Source Project
aac7b4455a Reconcile with ics-mr0-release
Change-Id: I224ac8e665f91c64935f7a20397b925aba767994
2011-12-06 08:56:01 -08:00
The Android Automerger
66f9dcdd25 ICL53D 2011-12-06 05:23:26 -08:00
The Android Automerger
4844adf4a9 IML66 2011-12-05 20:38:05 -08:00
The Android Automerger
7e9d3affc1 merge in ics-mr1-release history after reset to ics-mr1 2011-12-05 20:34:59 -08:00
The Android Automerger
77da392937 IML63B 2011-12-02 16:23:13 -08:00
The Android Automerger
eb41a7af1b merge in ics-mr1-release history after reset to ics-mr1 2011-12-02 16:20:17 -08:00
Doug Zongker
4eef12965b am bd2dadc2: check entire recovery partition on startup
* commit 'bd2dadc21a5db967972a7b8f81aad716609edacb':
  check entire recovery partition on startup
2011-12-02 13:58:08 -08:00
Doug Zongker
bd2dadc21a check entire recovery partition on startup
Checksum the entire recovery partition at boot time to see if we need
to rewrite it, rather than just the first 2kb.

Bug: 5668350
Change-Id: I777754f92e8da630ae3c09bb0d4c41884ff62f39
2011-12-02 13:55:57 -08:00
The Android Automerger
16da7247aa IML63 2011-12-02 10:27:28 -08:00
The Android Automerger
a214e6f5e8 merge in ics-mr1-release history after reset to ics-mr1 2011-12-02 10:24:07 -08:00
Scott Main
d34204b9ec am b83d8f15: am f5cbe002: Merge "docs: update template and css for android u Add a custom version of docpage.cs to the droiddoc template, because it adds a good deal of custom design and behavior (instead of updating the doclava version of the file). Add CSS for next/
* commit 'b83d8f15ccc276b190a6c02002f6af94aa2e9cb4':
  docs: update template and css for android u Add a custom version of docpage.cs to the droiddoc template, because it adds a good deal of custom design and behavior (instead of updating the doclava version of the file). Add CSS for next/previous links in android u lessons and revise style for download button.
2011-12-01 20:42:55 -08:00
Scott Main
b83d8f15cc am f5cbe002: Merge "docs: update template and css for android u Add a custom version of docpage.cs to the droiddoc template, because it adds a good deal of custom design and behavior (instead of updating the doclava version of the file). Add CSS for next/previous link
* commit 'f5cbe0024328f6d716dc13b8a836f058c9c74c64':
  docs: update template and css for android u Add a custom version of docpage.cs to the droiddoc template, because it adds a good deal of custom design and behavior (instead of updating the doclava version of the file). Add CSS for next/previous links in android u lessons and revise style for download button.
2011-12-01 20:40:59 -08:00
Scott Main
f5cbe00243 Merge "docs: update template and css for android u Add a custom version of docpage.cs to the droiddoc template, because it adds a good deal of custom design and behavior (instead of updating the doclava version of the file). Add CSS for next/previous links in android u lessons and revise style for download button." into ics-mr0 2011-12-01 20:39:29 -08:00
The Android Automerger
f63cb4f0d0 IML62B 2011-12-01 16:47:38 -08:00
The Android Automerger
c422e6e0b9 merge in ics-mr1-release history after reset to ics-mr1 2011-12-01 16:45:02 -08:00
The Android Automerger
c8f87721ba IML62 2011-12-01 06:48:19 -08:00
The Android Automerger
8edea4c3a6 merge in ics-mr1-release history after reset to ics-mr1 2011-12-01 06:45:22 -08:00
Scott Main
adc61d6a0e docs: update template and css for android u
Add a custom version of docpage.cs to the droiddoc template, because
it adds a good deal of custom design and behavior (instead of updating
the doclava version of the file). Add CSS for next/previous links in
android u lessons and revise style for download button.

Change-Id: I829c4fb134d6f5c3cee82fb86958d23ef64e8481
2011-11-30 18:55:01 -08:00
The Android Automerger
bf14d43c4d IML61B 2011-11-30 16:59:51 -08:00