Wu-cheng Li
d31ae2fc73
am 8b687440: am fcc7cf77: Fix the check of double quoted @see tag.
...
Merge commit '8b687440688ac41d6b6754537bf4a0f9dcb14fbd' into kraken
* commit '8b687440688ac41d6b6754537bf4a0f9dcb14fbd':
Fix the check of double quoted @see tag.
2010-04-13 11:53:15 -07:00
Raphael Moll
7058f499e9
Fix "make layoutlib" under Windows+Cygwin
...
Change-Id: I5277afe77f1e3367ecfd0933a9ab14a5a42c2be2
2010-04-13 10:49:29 -07:00
Wu-cheng Li
8b68744068
am fcc7cf77: Fix the check of double quoted @see tag.
...
Merge commit 'fcc7cf779905613d6bd48344b5c3a994237c02bd' into froyo-plus-aosp
* commit 'fcc7cf779905613d6bd48344b5c3a994237c02bd':
Fix the check of double quoted @see tag.
2010-04-13 09:20:18 -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
52e67ac24e
am db00a567: am 479f4a5c: 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 d
...
Merge commit 'db00a567759a6785c97a21fd3fbc1e6b792df4c7' into kraken
* commit 'db00a567759a6785c97a21fd3fbc1e6b792df4c7':
cherry-pick from master: I615602a3d8f9970e36399b98dadb5e2f03638444
2010-04-10 11:46:50 -07:00
Scott Main
db00a56775
am 479f4a5c: 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 st
...
Merge commit '479f4a5cc4db72024123d36145028fe557e72f98' into froyo-plus-aosp
* commit '479f4a5cc4db72024123d36145028fe557e72f98':
cherry-pick from master: I615602a3d8f9970e36399b98dadb5e2f03638444
2010-04-10 11:40:08 -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
b15c119d26
am 19e9fff3: am 74134a50: Add camera sounds to the emulator system image build.
...
Merge commit '19e9fff37e4d3309557d07cf963dc577ca49fcf0' into kraken
* commit '19e9fff37e4d3309557d07cf963dc577ca49fcf0':
Add camera sounds to the emulator system image build.
2010-04-08 22:50:33 -07:00
Xavier Ducrohet
19e9fff37e
am 74134a50: Add camera sounds to the emulator system image build.
...
Merge commit '74134a503fc908b28ad0ff87e1291698fbceb9cf' into froyo-plus-aosp
* commit '74134a503fc908b28ad0ff87e1291698fbceb9cf':
Add camera sounds to the emulator system image build.
2010-04-08 22:38:52 -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
Scott Main
7b6cee7653
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
Change-Id: I23f53d884f39a5f6a4b45172186e0d1c7619da30
2010-04-08 17:32:02 -07:00
Daniel Sandler
693e655513
am 83f002f7: am f96cb307: Merge "Add Protips to all builds." into froyo
...
Merge commit '83f002f758a54fbb7b690a3d0432cc911353eb18' into kraken
* commit '83f002f758a54fbb7b690a3d0432cc911353eb18':
Add Protips to all builds.
2010-04-08 17:05:02 -07:00
Daniel Sandler
83f002f758
am f96cb307: Merge "Add Protips to all builds." into froyo
...
Merge commit 'f96cb307e3c6d0eb08fd3e4a17d1d1af7c46d385' into froyo-plus-aosp
* commit 'f96cb307e3c6d0eb08fd3e4a17d1d1af7c46d385':
Add Protips to all builds.
2010-04-08 16:59:27 -07:00
Daniel Sandler
f96cb307e3
Merge "Add Protips to all builds." into froyo
2010-04-08 16:54:50 -07:00
The Android Automerger
6ca84ab127
FRF08
...
Change-Id: I11fef9bff647fb2cebe3f1377c2b36a1f75c4ea3
2010-04-08 08:27:32 -07:00
The Android Automerger
3be88c5102
Merge branch 'froyo' into froyo-release
2010-04-08 08:27:19 -07:00
Dianne Hackborn
f2a1c24dd1
am 966c7355: am 303b3412: Add clean step for SDK version change.
...
Merge commit '966c7355c3705095532bcc71ae6d893bdbe3531d' into kraken
* commit '966c7355c3705095532bcc71ae6d893bdbe3531d':
Add clean step for SDK version change.
2010-04-07 14:31:10 -07:00
Dianne Hackborn
966c7355c3
am 303b3412: Add clean step for SDK version change.
...
Merge commit '303b34121e0d331570bcb156b03251cca93a5631' into froyo-plus-aosp
* commit '303b34121e0d331570bcb156b03251cca93a5631':
Add clean step for SDK version change.
2010-04-07 14:26:06 -07:00
Dianne Hackborn
303b34121e
Add clean step for SDK version change.
...
Change-Id: I2ea85496af49572115dbbd9a98787b1fd54adc50
2010-04-07 14:13:47 -07:00
Daniel Sandler
a63b57c0cf
Add Protips to all builds.
...
Bug: 2559083
Change-Id: Ibd6333516a798f88e4d4ef08a6246812b1009a76
2010-04-07 16:49:07 -04:00
The Android Automerger
f6b9193603
FRF07
...
Change-Id: Ic2c57d9f58c7a79b44462f3f2350fef99da8acb4
2010-04-07 08:12:13 -07:00
The Android Automerger
86d142dbea
Merge branch 'froyo' into froyo-release
2010-04-07 08:12:01 -07:00
Joe Onorato
e0a18a75a9
Finish moving the policies out of frameworks/policies/base and into frameworks/base.
...
Change-Id: I6b3991de3276258318cab2aff9651f18b3d07f85
2010-04-06 20:21:29 -05:00
Dianne Hackborn
a98976b7c9
am efba0b98: It\'s beginning to look a lot like release time!
...
Merge commit 'efba0b9829ae375a7d7e2093dee707b79f1b8951' into froyo-plus-aosp
* commit 'efba0b9829ae375a7d7e2093dee707b79f1b8951':
It's beginning to look a lot like release time!
2010-04-06 12:58:50 -07:00
The Android Automerger
f951fab74e
FRF06
...
Change-Id: Ie3ed548f504bcb99828210310b12a18e709a2af5
2010-04-06 08:07:50 -07:00
Dianne Hackborn
efba0b9829
It's beginning to look a lot like release time!
...
Everywhere we build...
Froyo is now Android 2.2, API 8.
This breaks the YouTube prebuilt (yay prebuilts!) but little else.
Does this mean we are becoming mature?
Change-Id: I15d228d57853a0dfabc47dda253d55339a5b3d17
2010-04-05 12:33:11 -07:00
The Android Automerger
d5e079e72b
FRF05B
...
Change-Id: I7ab57347ccfd76674fdbcd9b5879c0a68f1abf72
2010-04-05 12:26:32 -07:00
Jean-Baptiste Queru
43e31a2056
Add extra IMEs in the full config
...
Bug: 2556582
Change-Id: I46de0d6d7755b169acaa7689de4ddadb0df9c41f
2010-04-05 11:40:20 -07:00
The Android Automerger
bf3bd5898d
FRF05
...
Change-Id: I35bfa4963157b395365fe0b5bcf64e448de244be
2010-04-05 08:03:01 -07:00
The Android Automerger
98bcd7120d
Merge branch 'froyo' into froyo-release
2010-04-05 08:02:49 -07:00
Xavier Ducrohet
3c9c36b70d
am 47c4bbe9: Package the proper vold config file in SDK system image.
...
Merge commit '47c4bbe9ebdf58a0f1b3fe2ecd979a341ee072d2' into froyo-plus-aosp
* commit '47c4bbe9ebdf58a0f1b3fe2ecd979a341ee072d2':
Package the proper vold config file in SDK system image.
2010-04-01 17:43:12 -07:00
android-build SharedAccount
6fb40d00b9
FRF01B
...
Change-Id: Ib9adba6d4da02287673c97267f479ecc3f1a308a
2010-04-01 13:36:40 -07:00
Xavier Ducrohet
47c4bbe9eb
Package the proper vold config file in SDK system image.
...
Change-Id: I7698c76d8d704837106450a32cba7b9c8f5b4446
2010-04-01 13:20:21 -07:00
Xavier Ducrohet
266bdf2ec3
am 04fd11d1: Merge "Add CarHome to the SDK." into froyo
...
Merge commit '04fd11d11246e419473f38bdddf31329182ae0a6' into froyo-plus-aosp
* commit '04fd11d11246e419473f38bdddf31329182ae0a6':
Add CarHome to the SDK.
2010-04-01 10:56:35 -07:00
Xavier Ducrohet
04fd11d112
Merge "Add CarHome to the SDK." into froyo
2010-04-01 10:50:01 -07:00
The Android Automerger
a47814a4d8
FRF01
...
Change-Id: If4b7c952f5213ed766aa2360ff47f379b4156d47
2010-04-01 08:07:49 -07:00
The Android Automerger
946fc38fe2
Merge branch 'froyo' into froyo-release
2010-04-01 08:07:37 -07:00
Ying Wang
434f0092d3
am 139e3324: Add symbols.zip and build.prop to sdk dist.
...
Merge commit '139e33243bbe92858f39919c220a4d65fe8790bd' into froyo-plus-aosp
* commit '139e33243bbe92858f39919c220a4d65fe8790bd':
Add symbols.zip and build.prop to sdk dist.
2010-03-31 23:17:45 -07:00
Ying Wang
139e33243b
Add symbols.zip and build.prop to sdk dist.
...
Change-Id: I667f5ef847a6e8e78c6b3df5c2b092bb5d863955
http://b/issue?id=2394164
2010-03-31 17:29:04 -07:00
android-build SharedAccount
8c16744054
FRE90B
...
Change-Id: I988b5b158dc10093c05df77a7ac6d5254a11d778
2010-03-31 15:25:11 -07:00
The Android Open Source Project
8b32022eae
merge from open-source master
...
Change-Id: Ic4d166897b594c4d5552a2bb1a89ed368cf2b782
2010-03-31 14:00:21 -07:00
The Android Automerger
23ec62984a
FRE90
...
Change-Id: I7102ec597dab436550826238e06fea33c54f29c3
2010-03-31 08:07:38 -07:00
The Android Automerger
2d11d0e513
Merge branch 'froyo' into froyo-release
2010-03-31 08:07:17 -07:00
Ying Wang
6714dbc236
Add comments for ANDROID_BUILD_SHELL
...
Change-Id: I71f0a1a08b097cd179bbcb684a9114267f9bf0db
2010-03-30 16:42:15 -07:00
Ying Wang
2ce495a0a7
Allow use of alternative to bash as the build shell.
...
Change-Id: Ib92217f90c98e04a1d16efd4904d9d7ba9dda3cf
http://b/issue?id=2557214
2010-03-30 12:55:13 -07:00
Xavier Ducrohet
9349bb1b5c
Add CarHome to the SDK.
...
Bug: 2526512
Change-Id: Ia4f127a4b5ac3bf52ff9664cfbca6fdbda3aa154
2010-03-30 11:42:55 -07:00