The Android Automerger
25d1ecfc02
FRF36
...
Change-Id: I659c91146118ae9cb8270cd96a45fb2b96041c3c
2010-05-06 17:55:18 -07:00
The Android Automerger
07b4d3f8b0
Merge branch 'froyo' into froyo-release
2010-05-06 17:55:05 -07:00
Dan Bornstein
03fb96f01e
Allow for a slightly larger libwebcore, add another library to the list,
...
correct/update a couple entries, and add a couple more comments.
Bug: 2651381
Change-Id: I9aaf48c3c2115b111794710bb4e959613bf22add
2010-05-06 12:43:47 -07:00
The Android Automerger
cb1affafb7
FRF35
...
Change-Id: I6251d32cd9dcaefefd1bd7d35e33e6a3a9c92f04
2010-05-05 22:11:46 -07:00
The Android Automerger
86e0e78862
Merge branch 'froyo' into froyo-release
2010-05-05 22:11:33 -07:00
Ying Wang
4e601a46a6
Merge "Hack to skip dexpreopt on Maps.apk and SholesQuickOffice.apk" into froyo-release
2010-05-05 14:50:04 -07:00
Dan Bornstein
3ca0e96a3a
Merge "Fixed a bunch of stuff in the prelink mappings file:" into froyo
2010-05-05 14:36:04 -07:00
Dan Bornstein
7dfcfbc0d4
Fixed a bunch of stuff in the prelink mappings file:
...
* Added mappings for most of the libraries that didn't already
have them (as observed from my build).
* Re-canonicalized all the offsets in the mappings file,
per the official policy of keeping things megabyte-aligned.
* Added comments on each line indicating what size the library
actually appeared to be in my build (to help with future rejiggerings).
* Added a bit of documentation about the whole deal.
Even with this change, I know there are other libraries that will
still need to be included, but I think what I have here is a good
step. Also, this change only reserves room for the new libraries, but
subsequent changes (in other subprojects) are required to actually
start prelinking the new libraries. Those changes will be forthcoming
as well.
Bug: 2651381
Change-Id: I7a06382fc2b8a14bbd3261de58df3f8a31e4108e
2010-05-05 00:10:37 -07:00
Ying Wang
67bddace22
Hack to skip dexpreopt on Maps.apk and SholesQuickOffice.apk
...
Change-Id: I733dd28a5df2542ba364095376c1ac033ef62bbd
http://b/issue?id=2650711
2010-05-04 17:24:28 -07:00
Scott Main
74108deaf1
fix css bug for paragraphs in table cells
...
- only select the direct descendant for p:last-child in a td
Change-Id: I9ad63b80914fbfe4d3e74041915f67b7a08d9649
2010-05-04 17:24:26 -07:00
android-build SharedAccount
45470ec246
FRF33B
...
Change-Id: I43e4e71d977ff530cc36565a0450edded231a34b
2010-05-03 15:15:03 -07:00
The Android Automerger
beb113e8fe
FRF33
...
Change-Id: I7991b820eb9ef0671dbbef2729dbfc3efd21e3af
2010-05-03 08:10:21 -07:00
The Android Automerger
dc83d4ec77
Merge branch 'froyo' into froyo-release
2010-05-03 08:10:08 -07:00
android-build SharedAccount
52aac5fe6d
FRF29B
...
Change-Id: Ib1d0b8236ef81f4c4e2fa4b97ed9be776b5602d1
2010-04-29 18:00:16 -07:00
The Android Automerger
e39a10c6e0
FRF29
...
Change-Id: I420d44a306f38461d0443142ce1ee0ea426d5cc0
2010-04-29 13:34:27 -07:00
Doug Zongker
2ea21065b6
add metadata to OTA package in easily-parsed form
...
This is only for use by the tools that manipulate OTA packages; it
doesn't touch device code.
Change-Id: I1e21b24b86340d8f86c9d15b2aeb79c461f75d18
2010-04-28 16:05:51 -07:00
The Android Automerger
b6d9c9ca6c
FRF28
...
Change-Id: I73b82507a9c4bd71e678771c9e0135806617857a
2010-04-28 12:21:35 -07:00
The Android Automerger
fce31d2828
Merge branch 'froyo' into froyo-release
2010-04-28 12:21:08 -07:00
Scott Main
c3d808a727
Merge "support a few more header levels for sidebox so the sidebox can be placed at any level and be semantically correct" into froyo
2010-04-27 14:23:04 -07:00
The Android Automerger
8345065996
FRF26
...
Change-Id: Ia56baf9d3ec4d1836cc41b13841ad7d5299cdb87
2010-04-26 11:45:10 -07:00
The Android Automerger
83da11d568
Merge branch 'froyo' into froyo-release
2010-04-26 11:44:47 -07:00
android-build SharedAccount
29334a8244
FRF23B
...
Change-Id: Ieac192af4ede1c43949e9a25825382a8f5cc4b38
2010-04-23 15:00:19 -07:00
Raphael
9ca1628e3f
Support building Windows SDK under Linux.
...
- envsetup.mk & config.mk: we define a new BUILD_OS and a minimal set
of things like BUILD_OUT to be able to use some local tools when
doing cross-compilation. This allows us to use the Linux version of
ACP when cross-compiling the tools to Windows.
- Makfile: include windows_sdk.mk when needed to build a Windows SDK.
- main.mk: support a win_sdk target (e.g. PRODUCT-sdk-win_sdk)
(Merge master Change I9d08d0df)
2010-04-23 13:17:23 -07:00
Raphael
4c70244cb1
Make zipalign build for the Win SDK under Linux.
...
(Merge master Change Ibd667437)
2010-04-23 13:15:37 -07:00
The Android Automerger
fa6b0f99d3
FRF23
...
Change-Id: I11369ad3f740a7f32924666a2be2d2324892d468
2010-04-23 11:55:17 -07:00
Scott Main
7f418a518b
support a few more header levels for sidebox so the sidebox can
...
be placed at any level and be semantically correct
Change-Id: I51b77e82a701e1898986698d3a58a1b8367ec5c6
2010-04-23 11:41:30 -07:00
The Android Automerger
cc1838f975
FRF22
...
Change-Id: Id599e3f330ee19ce3c521b618406a399fc05cc30
2010-04-22 16:16:49 -07:00
android-build SharedAccount
98dfda02e1
FRF21B
...
Change-Id: I81caf83e64aeb793df87132a2b70105cfc37cf6f
2010-04-21 15:49:51 -07:00
The Android Automerger
692c445486
FRF21
...
Change-Id: I0a48513425a3b5d327fc4baca48d660e1e7f3d51
2010-04-21 10:46:53 -07:00
The Android Automerger
a4dee66448
Merge branch 'froyo' into froyo-release
2010-04-21 10:46:41 -07:00
Scott Main
d72731d213
docs: misc css changes
...
make sidebox size match qv
make figure align with right margin
remove margins from the last <p> in a table cell
Change-Id: Ie655dac45728f782fb309f3c11c1b7ee56bc5660
2010-04-20 15:35:49 -07:00
Scott Main
f655dab5e6
Merge "docs: add script to capture the ctrl+f key event (initiates 'find' search on the page) and expand all inherited members." into froyo
2010-04-20 15:34:22 -07:00
Roman Nurik
af23298447
cherry-pick from master: 42092024eb
...
Enable query highlighting and result ranking for search autocomplete on d.a.c. Also make it case-insensitive.
Change-Id: I3dd0e4edd7efae5a5758952699c08f1a46bdfeda
2010-04-19 15:18:41 -07:00
The Android Automerger
6a867b179e
FRF19
...
Change-Id: I0001f872e23dafac03eea530997403dc924398ea
2010-04-19 12:50:36 -07:00
The Android Automerger
900d4182c8
Merge branch 'froyo' into froyo-release
2010-04-19 12:50:23 -07:00
Brad Fitzpatrick
135677a718
For userdebug builds, enable Dalvik lock contention sampling.
...
Change-Id: I75cca6fc0ac0d0adfc059a8f82b2f6ae584361f3
2010-04-19 07:51:12 -07:00
android-build SharedAccount
67d4bc5966
FRF15D
...
Change-Id: Ie9d5588da5e7ba40af0aa59380dbefdb2ae2190d
2010-04-16 13:29:19 -07:00
android-build SharedAccount
0de5104086
FRF15C
...
Change-Id: I18c1bcf6c5dafcab5fddfac9c91f2cb719989955
2010-04-16 11:44:21 -07:00
Scott Main
7a0090b316
docs: add script to capture the ctrl+f key event (initiates 'find' search
...
on the page) and expand all inherited members.
Also move the appropriate methods from -docs.js into -reference.js where
they belong and add some function documentation.
Change-Id: I421bbf27d3b41d377776b3d64a97380458fcebd6
2010-04-16 09:05:06 -07:00
android-build SharedAccount
60465723f1
FRF15B
...
Change-Id: Ie0b692ab96a598d5ce86151bc189bfd1ec339ae3
2010-04-15 15:43:06 -07:00
The Android Automerger
cb6604c127
FRF15
...
Change-Id: Ieb6a3aa05ecac44676e1f9af2ff42cb7b0982a7a
2010-04-15 08:12:44 -07:00
The Android Automerger
b98ce5612a
FRF14
...
Change-Id: I029b56662620274c63afb26239cd3aa982626bd7
2010-04-14 11:28:38 -07:00
The Android Automerger
7e5282c873
Merge branch 'froyo' into froyo-release
2010-04-14 11:28:25 -07:00
Wu-cheng Li
fcc7cf7799
Fix the check of double quoted @see tag.
...
Originally \n was not discarded so a balanced quoted string still
has compile error.
bug:2553570
Change-Id: I073c0c0ba370d55493d3ee6d17c7ebe9f42afe7a
2010-04-13 23:49:18 +08:00
The Android Automerger
85cdd5f6f4
FRF13
...
Change-Id: I42ad464136133700fb6e727bbb8d5c68899ede5f
2010-04-13 08:08:05 -07:00
The Android Automerger
f687da337c
FRF12B
...
Change-Id: I35a7addef84c4f4f1b31e6f3185155f44915f4b6
2010-04-12 15:45:43 -07:00
The Android Automerger
a9bdbbea1a
FRF12
...
Change-Id: I83a967378dddbdf116e41ebe1b8f2d667151d4ea
2010-04-12 09:45:42 -07:00
The Android Automerger
630310a189
Merge branch 'froyo' into froyo-release
2010-04-12 09:45:29 -07:00
Scott Main
479f4a5cc4
Merge "cherry-pick from master: I615602a3d8f9970e36399b98dadb5e2f03638444 docs: various stylesheet changes indent tables revise figure class add caption classes for tables and images add styles for xml reference docs (used by resource types docs) tweak styles for the icon tables to eliminate obscure 'caption' class" into froyo
2010-04-09 17:03:42 -07:00
Xavier Ducrohet
74134a503f
Add camera sounds to the emulator system image build.
...
Bug: 2538315
Change-Id: I30c477ecbe5f0c0a64ca7c3796e72642df0002bf
2010-04-08 18:07:40 -07:00