OSDN Git Service
Roman Nurik [Tue, 6 Mar 2012 22:41:13 +0000 (14:41 -0800)]
am
d9ca90b4: Add SDK template and assets for Android Design
* commit '
d9ca90b4b9bd631329e6241b1ac4824ad0821639':
Add SDK template and assets for Android Design
Roman Nurik [Tue, 6 Mar 2012 20:25:34 +0000 (12:25 -0800)]
Add SDK template and assets for Android Design
Change-Id: Id7a953bf59e5e05242c46cdfb2b425e80424fc2f
Dirk Dougherty [Tue, 6 Mar 2012 05:39:25 +0000 (21:39 -0800)]
am
7d114b19: doc change: assets for play
* commit '
7d114b195d2224ba8c6f8e156467b969317e0bf9':
doc change: assets for play
Dirk Dougherty [Mon, 5 Mar 2012 04:34:56 +0000 (20:34 -0800)]
doc change: assets for play
Change-Id: I58647fd0059c5de54dd7665527a73f61e0d2dd32
The Android Open Source Project [Sat, 3 Mar 2012 00:32:47 +0000 (16:32 -0800)]
Reconcile with ics-mr1-release
Change-Id: I7b6a55cf5ad81aa9ddfd4706a4f5998d3153534e
The Android Automerger [Fri, 2 Mar 2012 19:55:21 +0000 (11:55 -0800)]
IMM62
The Android Automerger [Fri, 2 Mar 2012 19:49:21 +0000 (11:49 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Open Source Project [Thu, 1 Mar 2012 18:11:36 +0000 (10:11 -0800)]
Reconcile with ics-mr1-release
Change-Id: I1e421d10ac99db335b199dfa0806d7e244d0c1e9
The Android Automerger [Tue, 28 Feb 2012 23:18:24 +0000 (15:18 -0800)]
IMM59
The Android Automerger [Tue, 28 Feb 2012 23:12:45 +0000 (15:12 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Tue, 28 Feb 2012 00:10:34 +0000 (16:10 -0800)]
IMM56D
The Android Automerger [Tue, 28 Feb 2012 00:09:47 +0000 (16:09 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Mon, 27 Feb 2012 22:44:07 +0000 (14:44 -0800)]
IMM56C
The Android Automerger [Mon, 27 Feb 2012 22:41:50 +0000 (14:41 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Mon, 27 Feb 2012 20:31:17 +0000 (12:31 -0800)]
IMM56B
The Android Automerger [Mon, 27 Feb 2012 20:28:07 +0000 (12:28 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Sat, 25 Feb 2012 18:45:47 +0000 (10:45 -0800)]
IMM56
The Android Automerger [Sat, 25 Feb 2012 18:41:34 +0000 (10:41 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Open Source Project [Fri, 24 Feb 2012 21:57:33 +0000 (13:57 -0800)]
Reconcile with ics-mr1-release
Change-Id: I347cd6c1e6227d2c15efdd5f855268dbe12cd497
Jean-Baptiste Queru [Fri, 24 Feb 2012 19:32:08 +0000 (11:32 -0800)]
am
20b970e2: Merge "Issue warning when "make snod" with dexpreopt enabled."
* commit '
20b970e25227c4144c61d0d6108905616dc4f08b':
Issue warning when "make snod" with dexpreopt enabled.
Jean-Baptiste Queru [Fri, 24 Feb 2012 19:20:14 +0000 (11:20 -0800)]
Merge "Issue warning when "make snod" with dexpreopt enabled."
Ying Wang [Fri, 24 Feb 2012 19:05:48 +0000 (11:05 -0800)]
Issue warning when "make snod" with dexpreopt enabled.
Change-Id: I481f963634dd384ed6d3de73dfeeda92b37d227e
The Android Automerger [Thu, 23 Feb 2012 18:48:19 +0000 (10:48 -0800)]
IMM54
The Android Automerger [Thu, 23 Feb 2012 18:43:30 +0000 (10:43 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Open Source Project [Tue, 21 Feb 2012 23:34:42 +0000 (15:34 -0800)]
Reconcile with ics-mr1-release
Change-Id: Ib089acee59a2ac7913b5d35185f165f777800626
The Android Automerger [Tue, 21 Feb 2012 23:30:40 +0000 (15:30 -0800)]
IMM52
The Android Automerger [Tue, 21 Feb 2012 23:25:53 +0000 (15:25 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Open Source Project [Tue, 21 Feb 2012 23:06:21 +0000 (15:06 -0800)]
Reconcile with ics-mr1-release
Change-Id: I3f6da4c538fdb160bed6228d1d57026c7e9c12eb
Xavier Ducrohet [Sat, 18 Feb 2012 01:08:29 +0000 (17:08 -0800)]
am
fe53eeb0: Declare the emulator as a multi-touch device.
* commit '
fe53eeb07617540dc4a920561f4bd2d4f8ae0aa9':
Declare the emulator as a multi-touch device.
Xavier Ducrohet [Sat, 18 Feb 2012 01:05:52 +0000 (17:05 -0800)]
Declare the emulator as a multi-touch device.
Also add the default handheld features.
Change-Id: I768094e5e9ef474ee4f6cce5c87c37b3681926ee
The Android Automerger [Sat, 18 Feb 2012 00:42:18 +0000 (16:42 -0800)]
IMM48
The Android Automerger [Sat, 18 Feb 2012 00:36:53 +0000 (16:36 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Open Source Project [Fri, 17 Feb 2012 16:09:26 +0000 (08:09 -0800)]
Reconcile with ics-mr1-release
Change-Id: I4b9445667934514a9c04ed8df17f422d7c3755aa
Xavier Ducrohet [Fri, 17 Feb 2012 00:37:51 +0000 (16:37 -0800)]
am
295cb9bc: Enable HW accelerated view framework for generic_x86 builds.
* commit '
295cb9bceef599f851db81a3942dc78bdb679fec':
Enable HW accelerated view framework for generic_x86 builds.
Xavier Ducrohet [Fri, 17 Feb 2012 00:35:42 +0000 (16:35 -0800)]
Enable HW accelerated view framework for generic_x86 builds.
Change-Id: Ib3bf3e7c08615c29c0086125552ae1a96a737b89
The Android Automerger [Fri, 17 Feb 2012 00:29:10 +0000 (16:29 -0800)]
IMM47B
The Android Automerger [Fri, 17 Feb 2012 00:24:21 +0000 (16:24 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Open Source Project [Thu, 16 Feb 2012 18:02:06 +0000 (10:02 -0800)]
Reconcile with ics-mr1-release
Change-Id: I3cf7e38adf5847f0b3327c738cf38c0df9abcdea
The Android Automerger [Thu, 16 Feb 2012 17:43:11 +0000 (09:43 -0800)]
IMM47
The Android Automerger [Thu, 16 Feb 2012 17:39:02 +0000 (09:39 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Jean-Baptiste Queru [Wed, 15 Feb 2012 22:04:45 +0000 (14:04 -0800)]
Move AOSP to another fake version number
Change-Id: Ida0282d1eccaa2bdaf4ca54aaf82680efdbaa271
The Android Automerger [Wed, 15 Feb 2012 20:35:15 +0000 (12:35 -0800)]
IMM46
The Android Automerger [Wed, 15 Feb 2012 20:30:49 +0000 (12:30 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Jean-Baptiste Queru [Tue, 14 Feb 2012 22:51:24 +0000 (14:51 -0800)]
am
e7754220: Merge "Merge "Move Windows SDK whitelist out of main.mk""
* commit '
e77542205f36f063c68407a7de0af2ce80e856d3':
Merge "Move Windows SDK whitelist out of main.mk"
The Android Automerger [Tue, 14 Feb 2012 22:20:59 +0000 (14:20 -0800)]
IMM45
The Android Automerger [Tue, 14 Feb 2012 22:13:48 +0000 (14:13 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Jean-Baptiste Queru [Tue, 14 Feb 2012 21:08:13 +0000 (13:08 -0800)]
Merge "Merge "Move Windows SDK whitelist out of main.mk""
Raphael Moll [Thu, 26 Jan 2012 23:11:46 +0000 (15:11 -0800)]
Merge "Move Windows SDK whitelist out of main.mk"
This replaces the list maintained in build/core/main.mk
by 2 makefiles in sdk.git and development.git.
Pre-requisite CLs: Change Ifa8111dbae for sdk.git
and Change Ie6f728bee for development.git
(cherry-pick of
347f3051814d7d36a9a6af387e724bb327b53ecd)
Change-Id: I6d1f4c974a6425e50e3e287c66a4e8090cf814cb
The Android Automerger [Tue, 14 Feb 2012 00:36:49 +0000 (16:36 -0800)]
IMM30E
Jean-Baptiste Queru [Mon, 13 Feb 2012 22:27:27 +0000 (14:27 -0800)]
am
45873583: Merge "Add extra environment info to build output"
* commit '
458735839a82d2d381edbe71ed924d309bf07c55':
Add extra environment info to build output
Jean-Baptiste Queru [Mon, 13 Feb 2012 22:23:30 +0000 (14:23 -0800)]
Merge "Add extra environment info to build output"
Conley Owens [Tue, 7 Feb 2012 19:16:42 +0000 (11:16 -0800)]
Add extra environment info to build output
This should help us support users with build issues.
Given that they inculde the dumpvars in their error report,
we will be able to avoid asking standard questions like
"what version of Ubuntu are you using?"
Change-Id: Ib7c452d805d5e64075a44dc40e41d4605cc1ef4a
The Android Open Source Project [Tue, 7 Feb 2012 18:09:02 +0000 (10:09 -0800)]
Reconcile with ics-mr1-release
Change-Id: I8399f0a69c4192e7ef65e3097e7a6820e400e436
The Android Automerger [Tue, 7 Feb 2012 04:29:06 +0000 (20:29 -0800)]
IMM30D
Ed Heyl [Mon, 6 Feb 2012 21:09:03 +0000 (13:09 -0800)]
am
daeb1d90: am
c547a4d5: Please do not merge (already submitted downstream); check entire recovery partition on startup
* commit '
daeb1d90415f645269d10d7d61c17c59a5cad61f':
Please do not merge (already submitted downstream); check entire recovery partition on startup
Ed Heyl [Mon, 6 Feb 2012 21:07:38 +0000 (13:07 -0800)]
am
c547a4d5: Please do not merge (already submitted downstream); check entire recovery partition on startup
* commit '
c547a4d50b92c8f8173bf4222169f87200a76dba':
Please do not merge (already submitted downstream); check entire recovery partition on startup
Ed Heyl [Mon, 6 Feb 2012 21:03:43 +0000 (13:03 -0800)]
Please do not merge (already submitted downstream); 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
The Android Automerger [Mon, 6 Feb 2012 16:44:05 +0000 (08:44 -0800)]
IMM30C
The Android Automerger [Mon, 6 Feb 2012 16:42:38 +0000 (08:42 -0800)]
IMM3C
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 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