OSDN Git Service
Jean-Baptiste Queru [Fri, 3 Feb 2012 06:37:26 +0000 (22:37 -0800)]
am
5aec09b5: am
9a741915: Merge "Add annotations to the sdk build."
* commit '
5aec09b5f3537d0c700b93ede1718a97dbec0050':
Add annotations to the sdk build.
Jean-Baptiste Queru [Fri, 3 Feb 2012 06:34:18 +0000 (22:34 -0800)]
am
9a741915: Merge "Add annotations to the sdk build."
* commit '
9a7419153e7fffa6056a24b567ff3f45111aa0c0':
Add annotations to the sdk build.
Jean-Baptiste Queru [Thu, 2 Feb 2012 21:43:06 +0000 (13:43 -0800)]
Merge "Add annotations to the sdk build."
Xavier Ducrohet [Fri, 27 Jan 2012 23:45:35 +0000 (15:45 -0800)]
Add annotations to the sdk build.
Change-Id: I22ab1e737f05f6134ec9701c8ed69642a3708fbf
The Android Open Source Project [Wed, 1 Feb 2012 17:57:50 +0000 (09:57 -0800)]
Ignore
75c781c9
Change-Id: Id97047a665c03bcf35785fba3785cf5575f3341b
The Android Open Source Project [Wed, 1 Feb 2012 16:49:25 +0000 (08:49 -0800)]
Reconcile with ics-mr1-release
Change-Id: I1d101ce7d4690a74f494cdc605e797130946210c
The Android Open Source Project [Wed, 1 Feb 2012 16:42:31 +0000 (08:42 -0800)]
Reconcile with ics-mr1-release
Change-Id: Icc486a00d6c067c87364023fcf7226686dc0642a
The Android Automerger [Wed, 1 Feb 2012 00:24:20 +0000 (16:24 -0800)]
IMM30B
The Android Automerger [Tue, 31 Jan 2012 23:43:31 +0000 (15:43 -0800)]
IMM29
The Android Automerger [Tue, 31 Jan 2012 23:40:59 +0000 (15:40 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Scott Main [Tue, 31 Jan 2012 23:21:32 +0000 (15:21 -0800)]
am
7f24ddbc: Merge "docs: add the sidenav h2 back to the stylesheet for compatibility w/ javadocs" into ics-mr1
* commit '
7f24ddbc75b301cd3520e8fefaeb2e94a6dcc80b':
docs: add the sidenav h2 back to the stylesheet for compatibility w/ javadocs
Scott Main [Tue, 31 Jan 2012 23:19:44 +0000 (15:19 -0800)]
Merge "docs: add the sidenav h2 back to the stylesheet for compatibility w/ javadocs" into ics-mr1
Scott Main [Tue, 31 Jan 2012 23:18:47 +0000 (15:18 -0800)]
docs: add the sidenav h2 back to the stylesheet for compatibility w/ javadocs
Change-Id: I37551efd09bea528200a93a8d3602ea11e63f140
Scott Main [Tue, 31 Jan 2012 22:26:19 +0000 (14:26 -0800)]
am
5be15a0f: Merge "docs: update TOS and PP links to point to unified policy/tems also add a link to the b.android.com issue for reporting doc issues and open footer links in a new window issue:
5931704" into ics-mr1
* commit '
5be15a0f13ce559ca6339f0d2cf3dca9f3001dc1':
docs: update TOS and PP links to point to unified policy/tems also add a link to the b.android.com issue for reporting doc issues and open footer links in a new window issue:
5931704
Scott Main [Tue, 31 Jan 2012 22:24:54 +0000 (14:24 -0800)]
Merge "docs: update TOS and PP links to point to unified policy/tems also add a link to the b.android.com issue for reporting doc issues and open footer links in a new window issue:
5931704" into ics-mr1
Scott Main [Tue, 31 Jan 2012 18:09:34 +0000 (10:09 -0800)]
docs: update TOS and PP links to point to unified policy/tems
also add a link to the b.android.com issue for reporting doc issues
and open footer links in a new window
issue:
5931704
Change-Id: Icd6e9b7fb742b05a3c2064b6f2f7767b5b7ed1d8
The Android Automerger [Tue, 31 Jan 2012 07:40:32 +0000 (23:40 -0800)]
IMM26B
The Android Automerger [Tue, 31 Jan 2012 07:38:52 +0000 (23:38 -0800)]
IMM26
The Android Automerger [Tue, 31 Jan 2012 07:33:57 +0000 (23:33 -0800)]
IMM26B
The Android Automerger [Tue, 31 Jan 2012 07:33:21 +0000 (23:33 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Scott Main [Tue, 31 Jan 2012 01:23:02 +0000 (17:23 -0800)]
am
2032e319: docs: add schema.org sitenavigation scope for sid-navs
* commit '
2032e31979d0708120b4785bad6ee19ee1c4dc0c':
docs: add schema.org sitenavigation scope for sid-navs
Scott Main [Tue, 31 Jan 2012 00:26:41 +0000 (16:26 -0800)]
docs: add schema.org sitenavigation scope for sid-navs
Change-Id: I0952195223f93bda67af0b951c3a061fe92948ce
Scott Main [Tue, 31 Jan 2012 00:15:28 +0000 (16:15 -0800)]
am
939c3f72: docs: modify css to support sidenav headings with span, instead of h2 because I suspect the h2 is sending mixed signals to search engines for result snippets
* commit '
939c3f72280fadbdc192b6bedd97555c2fcd4ef3':
docs: modify css to support sidenav headings with span, instead of h2 because I suspect the h2 is sending mixed signals to search engines for result snippets
Scott Main [Mon, 30 Jan 2012 23:14:07 +0000 (15:14 -0800)]
docs: modify css to support sidenav headings with span, instead of h2
because I suspect the h2 is sending mixed signals to search engines for result snippets
Change-Id: I80f13774f25439efebcade1b9db41c005018d2aa
Scott Main [Mon, 30 Jan 2012 23:14:44 +0000 (15:14 -0800)]
am
3652a113: docs: add support for meta descriptions in the <head>
* commit '
3652a113d1a099ece283e3154188f4a42958c298':
docs: add support for meta descriptions in the <head>
The Android Open Source Project [Mon, 30 Jan 2012 21:36:23 +0000 (13:36 -0800)]
Reconcile with ics-mr1-release
Change-Id: Iae7c919c7e0b4dcbf024514431421cdfd225a507
The Android Automerger [Mon, 30 Jan 2012 21:26:51 +0000 (13:26 -0800)]
IMM30
The Android Automerger [Mon, 30 Jan 2012 21:21:49 +0000 (13:21 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Scott Main [Mon, 30 Jan 2012 21:03:08 +0000 (13:03 -0800)]
docs: add support for meta descriptions in the <head>
Change-Id: I7ff7a5083a75dde718b4701623e029c225289617
Scott Main [Mon, 30 Jan 2012 18:04:17 +0000 (10:04 -0800)]
am
dc7418b2: docs: add images for g+ homepage announcement
* commit '
dc7418b282faf264c495e82a5bc3366e8348676c':
docs: add images for g+ homepage announcement
Scott Main [Mon, 30 Jan 2012 17:53:13 +0000 (09:53 -0800)]
docs: add images for g+ homepage announcement
Change-Id: I36430a1885be368218e1c896d6fc008355096a06
The Android Automerger [Fri, 27 Jan 2012 02:32:53 +0000 (18:32 -0800)]
IMM26
The Android Automerger [Fri, 27 Jan 2012 02:31:51 +0000 (18:31 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Wed, 25 Jan 2012 20:11:56 +0000 (12:11 -0800)]
IMM25
The Android Automerger [Wed, 25 Jan 2012 20:07:31 +0000 (12:07 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Tue, 24 Jan 2012 21:35:44 +0000 (13:35 -0800)]
IMM24
The Android Automerger [Tue, 24 Jan 2012 21:31:44 +0000 (13:31 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Jean-Baptiste Queru [Tue, 24 Jan 2012 16:38:57 +0000 (08:38 -0800)]
am
7a8efe57: Merge "Remove non-existent AlarmProvider to fix SDK build."
* commit '
7a8efe57a9505940cd51c7664e8643ec9da9d24d':
Remove non-existent AlarmProvider to fix SDK build.
Jean-Baptiste Queru [Tue, 24 Jan 2012 15:50:01 +0000 (07:50 -0800)]
Merge "Remove non-existent AlarmProvider to fix SDK build."
The Android Automerger [Tue, 24 Jan 2012 00:55:54 +0000 (16:55 -0800)]
IMM20C
Ying Wang [Mon, 23 Jan 2012 18:53:23 +0000 (10:53 -0800)]
Remove non-existent AlarmProvider to fix SDK build.
Change-Id: Ifcd087b9022f29b4b7065a72cafbbc6b3704860b
The Android Open Source Project [Mon, 23 Jan 2012 18:15:33 +0000 (10:15 -0800)]
Reconcile with ics-mr1-release
Change-Id: I6e64890cacfdb167f2f0c7a5e3917284e391ce11
The Android Automerger [Sat, 21 Jan 2012 00:31:06 +0000 (16:31 -0800)]
IMM20B
The Android Automerger [Sat, 21 Jan 2012 00:15:22 +0000 (16:15 -0800)]
IMM20
The Android Automerger [Sat, 21 Jan 2012 00:11:14 +0000 (16:11 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Open Source Project [Fri, 20 Jan 2012 18:25:20 +0000 (10:25 -0800)]
Reconcile with ics-mr1-release
Change-Id: I3bdc5d19073e63e031b684bede64b1f5ebdf13e7
The Android Automerger [Fri, 20 Jan 2012 00:31:16 +0000 (16:31 -0800)]
IMM19
The Android Automerger [Fri, 20 Jan 2012 00:27:27 +0000 (16:27 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Open Source Project [Thu, 19 Jan 2012 21:06:25 +0000 (13:06 -0800)]
Reconcile with ics-mr1-release
Change-Id: I06332ff4f1ca17df8303819c8ea85cf5f63712ca
The Android Automerger [Thu, 19 Jan 2012 05:20:54 +0000 (21:20 -0800)]
IMM18
The Android Automerger [Thu, 19 Jan 2012 05:16:29 +0000 (21:16 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Sat, 14 Jan 2012 00:21:18 +0000 (16:21 -0800)]
IMM13
The Android Automerger [Sat, 14 Jan 2012 00:16:51 +0000 (16:16 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Jean-Baptiste Queru [Fri, 13 Jan 2012 01:20:28 +0000 (17:20 -0800)]
am
fdbb9f94: am
96a228bd: Merge "Remove mention of layoutopt/uix as they are gone."
* commit '
fdbb9f94bc4b22f60fb46d0babb52c2a0d047aef':
Remove mention of layoutopt/uix as they are gone.
Jean-Baptiste Queru [Fri, 13 Jan 2012 01:18:48 +0000 (17:18 -0800)]
am
96a228bd: Merge "Remove mention of layoutopt/uix as they are gone."
* commit '
96a228bd7904b83274575522a267d178b3da2341':
Remove mention of layoutopt/uix as they are gone.
Jean-Baptiste Queru [Thu, 12 Jan 2012 22:07:20 +0000 (14:07 -0800)]
Merge "Remove mention of layoutopt/uix as they are gone."
The Android Automerger [Thu, 12 Jan 2012 22:04:09 +0000 (14:04 -0800)]
IMM12
The Android Automerger [Thu, 12 Jan 2012 22:00:23 +0000 (14:00 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Open Source Project [Thu, 12 Jan 2012 16:56:04 +0000 (08:56 -0800)]
Reconcile with ics-mr1-release
Change-Id: I8aa81509837cca423f8ac241d97e45d822086acf
Xavier Ducrohet [Thu, 12 Jan 2012 02:07:31 +0000 (18:07 -0800)]
Remove mention of layoutopt/uix as they are gone.
The Android Automerger [Thu, 12 Jan 2012 00:31:51 +0000 (16:31 -0800)]
IMM11
The Android Automerger [Thu, 12 Jan 2012 00:27:43 +0000 (16:27 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Scott Main [Wed, 11 Jan 2012 01:16:53 +0000 (17:16 -0800)]
am
f962eb10: Merge "docs: add css for Android Design links and add link to site header" into ics-mr1
* commit '
f962eb101b21814556f4edeb7128508d47cf5564':
docs: add css for Android Design links and add link to site header
Scott Main [Wed, 11 Jan 2012 01:14:34 +0000 (17:14 -0800)]
Merge "docs: add css for Android Design links and add link to site header" into ics-mr1
Vladimir Chtchetkine [Wed, 11 Jan 2012 00:42:47 +0000 (16:42 -0800)]
am
2cbcd24b: Cherry-picked from
e6b969f3b in Do not merge.
* commit '
2cbcd24ba708be5e387b8bf54351f5c2df7abbec':
Cherry-picked from
e6b969f3b in master. Do not merge.
Vladimir Chtchetkine [Tue, 13 Dec 2011 19:31:54 +0000 (11:31 -0800)]
Cherry-picked from
e6b969f3b in Do not merge.
Add boot property enabling ADBD over QEMU
Emulator and system image now support ADBD communication over QEMUD pipe rather
than over a TCP port forwarding. However, emulator has to know ahead of time
(before system starts booting) whether or not the system image supports ADBD
over pipe to properly setup the communication. For that, we introduce a boot
property "ro.adb.qemu" that is readable by the emulator early enough for the
proper ADB communication setup.
Change-Id: I978489c5acf46177b520e775d745bcc78f469837
Scott Main [Tue, 10 Jan 2012 17:59:22 +0000 (09:59 -0800)]
docs: add css for Android Design links and add link to site header
Change-Id: I0a9469519076b1c5b9d7c121df1f2c731a08d2cb
The Android Open Source Project [Sat, 7 Jan 2012 02:14:56 +0000 (18:14 -0800)]
Reconcile with ics-mr1-release
Change-Id: I6903bc47ab690fd56612f4e0e6289bf7a9799dca
Jean-Baptiste Queru [Sat, 7 Jan 2012 01:37:02 +0000 (17:37 -0800)]
am
5ea72eff: Use the new location of the emulator kernel
* commit '
5ea72effbd944891708d2d6fb61055830e617701':
Use the new location of the emulator kernel
Jean-Baptiste Queru [Sat, 7 Jan 2012 00:44:06 +0000 (16:44 -0800)]
Use the new location of the emulator kernel
The Android Automerger [Sat, 7 Jan 2012 00:34:51 +0000 (16:34 -0800)]
IMM06
The Android Automerger [Sat, 7 Jan 2012 00:31:06 +0000 (16:31 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Jean-Baptiste Queru [Fri, 6 Jan 2012 23:18:21 +0000 (15:18 -0800)]
am
a230c4d0: Reference kernel notice in the new location
* commit '
a230c4d049258915f6614e7a3fadc2dcfec3e160':
Reference kernel notice in the new location
Jean-Baptiste Queru [Fri, 6 Jan 2012 23:05:53 +0000 (15:05 -0800)]
Reference kernel notice in the new location
The Android Open Source Project [Thu, 5 Jan 2012 15:45:15 +0000 (07:45 -0800)]
Reconcile with ics-mr1-release
Change-Id: Iaa3637a3db5b9f2c8c4721a8ea2cb230336753f5
Al Sutton [Thu, 5 Jan 2012 04:41:53 +0000 (20:41 -0800)]
am
d8765f0f: am
80cfc37d: Partial fix for emulator under Lion.
* commit '
d8765f0f843e78c691c77264619125954d710b1a':
Partial fix for emulator under Lion.
Al Sutton [Thu, 5 Jan 2012 04:40:35 +0000 (20:40 -0800)]
am
80cfc37d: Partial fix for emulator under Lion.
* commit '
80cfc37d0f0ddbb7db09b7662b84e816ab409537':
Partial fix for emulator under Lion.
The Android Automerger [Thu, 5 Jan 2012 00:45:21 +0000 (16:45 -0800)]
IMM04
Ed Heyl [Thu, 5 Jan 2012 00:42:14 +0000 (16:42 -0800)]
Merge commit '
9a46327e' into ics-mr1-plus-aosp
The Android Automerger [Thu, 5 Jan 2012 00:41:01 +0000 (16:41 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Ed Heyl [Thu, 5 Jan 2012 00:34:18 +0000 (16:34 -0800)]
increment version to 4.0.4
Change-Id: I156516aedb714f589bd0ae2d39bc9e273b775276
Al Sutton [Wed, 4 Jan 2012 23:16:50 +0000 (15:16 -0800)]
Partial fix for emulator under Lion.
Don't use -Wl,-dynamic on Lion
Conley Owens [Fri, 23 Dec 2011 00:52:42 +0000 (16:52 -0800)]
am
d38c870d: Get build system to work with Make 3.82
* commit '
d38c870d2e168b051692b20ade0fc966c9e2daf7':
Get build system to work with Make 3.82
Conley Owens [Thu, 22 Dec 2011 17:46:19 +0000 (09:46 -0800)]
Get build system to work with Make 3.82
Note: `sort` can't seem to handle newlines in 3.82.
Change-Id: Ieeaee1d19688688a02e396bbc5b4dea26e7f6943
Al Sutton [Thu, 22 Dec 2011 00:45:21 +0000 (16:45 -0800)]
am
9ce06f11: Don\'t run ranlib on MacOS 10.7
* commit '
9ce06f11d69f5154843c234fe0624f9e70d39359':
Don't run ranlib on MacOS 10.7
Atte Peltomaki [Thu, 22 Dec 2011 00:45:20 +0000 (16:45 -0800)]
am
60fe963c: build: explicitly define dependency files
* commit '
60fe963c63c1b98255ad1cf40573b81b5d90d9c3':
build: explicitly define dependency files
Al Sutton [Wed, 21 Dec 2011 21:12:05 +0000 (13:12 -0800)]
Don't run ranlib on MacOS 10.7
Change-Id: I74f4623e6044dd804669aaa70c6e410fa8988d75
Atte Peltomaki [Wed, 21 Dec 2011 17:24:09 +0000 (09:24 -0800)]
build: explicitly define dependency files
Groundwork for distcc support in Android build system,
see distcc FAQ for details on why -MF is needed:
http://distcc.googlecode.com/svn/trunk/doc/web/faq.html
The Android Open Source Project [Wed, 21 Dec 2011 15:19:13 +0000 (07:19 -0800)]
Reconcile with ics-mr1-release
Change-Id: Idb5f4da7a973995eafb7233d864c0cf379e35db7
The Android Automerger [Wed, 21 Dec 2011 01:29:41 +0000 (17:29 -0800)]
IML81
The Android Automerger [Wed, 21 Dec 2011 01:26:02 +0000 (17:26 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Open Source Project [Tue, 20 Dec 2011 21:08:24 +0000 (13:08 -0800)]
Reconcile with ics-mr1-release
Change-Id: I3624715f06ac682520676b2e6d45a29e1d20b1d9
Bruce Beare [Thu, 1 Dec 2011 20:46:12 +0000 (12:46 -0800)]
If setupwizard is disabled, don't force it to optional
Change-Id: I15912ed77b88ea94feb149fdd081a309e3cf4678
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
The Android Automerger [Sun, 18 Dec 2011 01:30:21 +0000 (17:30 -0800)]
IML77B
The Android Automerger [Fri, 16 Dec 2011 20:02:53 +0000 (12:02 -0800)]
IML77
The Android Automerger [Fri, 16 Dec 2011 20:01:24 +0000 (12:01 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Open Source Project [Fri, 16 Dec 2011 16:07:59 +0000 (08:07 -0800)]
Reconcile with ics-mr1-release
Change-Id: I4efd2763f8ae4da60277edc110ff8649869a35e7
The Android Automerger [Fri, 16 Dec 2011 08:15:10 +0000 (00:15 -0800)]
IML74K
The Android Automerger [Fri, 16 Dec 2011 05:43:32 +0000 (21:43 -0800)]
IML74J
The Android Automerger [Fri, 16 Dec 2011 04:50:23 +0000 (20:50 -0800)]
IML74I