StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,977 Commits 1 Branch 0 Tags
dfe9fa5090ede71a2f69ec2e09f46a4a00e5a008
Commit Graph

6977 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Doug Zongker
dfe9fa5090 am bd2dadc2: check entire recovery partition on startup 
* commit 'bd2dadc21a5db967972a7b8f81aad716609edacb':
  check entire recovery partition on startup
 2011-12-02 13:58:17 -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
Scott Main
148588b4de 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:43:02 -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
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
Marius Renn
6c33b94c48 am 72db32c7: Merge "Google Add-On API Documentation Fixes (5429077)" into ics-mr1 
* commit '72db32c744744ae1ace26830ecce968b6a95e173':
  Google Add-On API Documentation Fixes (5429077)
 2011-11-30 09:54:25 -08:00
Marius Renn
72db32c744 Merge "Google Add-On API Documentation Fixes (5429077)" into ics-mr1 2011-11-30 09:51:17 -08:00
The Android Open Source Project
e14698cd12 am c99c8c08: Reconcile with ics-mr0-release 
* commit 'c99c8c081467085c548edf03cbc1500ba3852b44':
  ICL53C
 2011-11-29 07:56:26 -08:00
The Android Open Source Project
c99c8c0814 Reconcile with ics-mr0-release 
Change-Id: I612e5d0bd573f86dd61cbe0b47d0b691973539a5
 2011-11-29 07:54:00 -08:00
Tor Norbye
5c0c741f2a am 3997910e: am 5dd51bde: Build fix - include sdk/lint in build. do not merge. 
* commit '3997910eeaff5a605f2f2968dd0c617dcd10183d':
  Build fix - include sdk/lint in build. do not merge.
 2011-11-28 14:27:14 -08:00
Tor Norbye
3997910eea am 5dd51bde: Build fix - include sdk/lint in build. do not merge. 
* commit '5dd51bde0b0b4a8ca6d1b6a8da1f6739197999a2':
  Build fix - include sdk/lint in build. do not merge.
 2011-11-28 13:37:17 -08:00
Tor Norbye
5dd51bde0b Build fix - include sdk/lint in build. do not merge. 
(cherry picked from commit 4377cc701a)

Change-Id: I28dd89ad6471c82d344ecf88cecb2b96361b2050
 2011-11-28 13:07:53 -08:00
The Android Automerger
9101da9742 ICL53C 2011-11-26 12:29:48 -08:00
Marius Renn
b1df701ed8 Google Add-On API Documentation Fixes (5429077) 
We no longer want a reference directory, but rather
maps_api and effects_api directories.

Change-Id: I72b3a342d0871ec4cf7010be0d2b6486ca83571b
 2011-11-23 18:08:51 -08:00
The Android Open Source Project
1bdf9cd0c6 am 070e712f: Reconcile with ics-mr0-release ics-factoryrom-2-release 
* commit '070e712fb3037b28e81340eb2e4fb53d1539130d':
  ITL41G
  ICL53B
 2011-11-23 09:24:46 -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
b28ecc70c9 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 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
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