OSDN Git Service
Justin Ho [Tue, 9 Apr 2013 15:21:39 +0000 (08:21 -0700)]
This is JER09
Change-Id: I0cc358c96b1c090dc26e20fec40982a21bca7474
Justin Ho [Mon, 8 Apr 2013 15:07:26 +0000 (08:07 -0700)]
This is JER08
Change-Id: Ide7d8fd915c6ee0d0f856d8cb60d7f68ea58c961
Ed Heyl [Fri, 5 Apr 2013 16:14:18 +0000 (09:14 -0700)]
JER05
Change-Id: Ice879d6d5884c4193e65e1445c3e077fe7151650
The Android Automerger [Wed, 20 Mar 2013 19:24:22 +0000 (12:24 -0700)]
JDQ39E
The Android Automerger [Thu, 14 Mar 2013 16:09:42 +0000 (09:09 -0700)]
JDQ39D
The Android Automerger [Tue, 12 Mar 2013 18:24:51 +0000 (11:24 -0700)]
JDQ39C
The Android Automerger [Mon, 4 Mar 2013 19:08:59 +0000 (11:08 -0800)]
JDQ39B
The Android Automerger [Fri, 8 Feb 2013 21:51:43 +0000 (13:51 -0800)]
JDQ39
The Android Automerger [Fri, 8 Feb 2013 21:50:51 +0000 (13:50 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Scott Main [Fri, 8 Feb 2013 01:00:42 +0000 (17:00 -0800)]
am
b7f96375: docs: fix ::selection style to use Android blue for text highlighting
# Via Scott Main
* commit '
b7f963758f1a252a943b67b200b8e6141d94430c':
docs: fix ::selection style to use Android blue for text highlighting
Scott Main [Fri, 8 Feb 2013 00:56:43 +0000 (16:56 -0800)]
docs: fix ::selection style to use Android blue for text highlighting
Change-Id: I485be948326fc40c349c8170dd1be13962b4c003
The Android Automerger [Thu, 7 Feb 2013 22:23:55 +0000 (14:23 -0800)]
JDQ38
The Android Automerger [Thu, 7 Feb 2013 22:23:13 +0000 (14:23 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
The Android Automerger [Wed, 6 Feb 2013 00:48:44 +0000 (16:48 -0800)]
JDQ36B
The Android Automerger [Tue, 5 Feb 2013 20:24:50 +0000 (12:24 -0800)]
JDQ36
The Android Automerger [Tue, 5 Feb 2013 20:24:05 +0000 (12:24 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
The Android Automerger [Sat, 2 Feb 2013 04:45:42 +0000 (20:45 -0800)]
JDQ32B
The Android Automerger [Sat, 2 Feb 2013 02:25:58 +0000 (18:25 -0800)]
JDQ32
The Android Automerger [Sat, 2 Feb 2013 02:24:59 +0000 (18:24 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Scott Main [Fri, 1 Feb 2013 23:34:17 +0000 (15:34 -0800)]
am
6668404e: Merge "docs: minimize code-font line-height. Fixes problem in which any paragraph with code text has more whitespace below it than other lines." into jb-mr1-dev
# Via Android (Google) Code Review (1) and Scott Main (1)
* commit '
6668404ede38d806102eb481d857ca8c0931d364':
docs: minimize code-font line-height. Fixes problem in which any paragraph with code text has more whitespace below it than other lines.
Scott Main [Fri, 1 Feb 2013 23:34:17 +0000 (15:34 -0800)]
am
77c51357: docs: fix lang switcher for gae by deleting obsolete method call
# Via Scott Main
* commit '
77c51357eb1ba3b55d0a9363cb981daab1b484d2':
docs: fix lang switcher for gae by deleting obsolete method call
Scott Main [Fri, 1 Feb 2013 23:31:56 +0000 (23:31 +0000)]
Merge "docs: minimize code-font line-height. Fixes problem in which any paragraph with code text has more whitespace below it than other lines." into jb-mr1-dev
Scott Main [Fri, 1 Feb 2013 23:29:44 +0000 (15:29 -0800)]
docs: minimize code-font line-height.
Fixes problem in which any paragraph with code text has more whitespace below it than other lines.
Change-Id: I0f39655472d09f5af346c7c7e4df8eb0a5a144df
Scott Main [Fri, 1 Feb 2013 21:28:09 +0000 (13:28 -0800)]
am
98f23e7a: docs: delete obsolete asset files
# Via Scott Main
* commit '
98f23e7af0480b70515552195e359633191f83d8':
docs: delete obsolete asset files
Scott Main [Fri, 1 Feb 2013 21:28:02 +0000 (13:28 -0800)]
am
e05e6f99: docs: update template files with those from the templates-ds directory
# Via Scott Main
* commit '
e05e6f99b312e9a7b460b70986a419d30576d66c':
docs: update template files with those from the templates-ds directory
Scott Main [Fri, 1 Feb 2013 21:27:58 +0000 (13:27 -0800)]
am
015d616a: docs: use devsite hdf bool as a javascript condition for managing the lang toggle. sync the sdk and ds templates so we can move toward one template set
# Via Scott Main
* commit '
015d616af8cf72cf609b19257604e520a70c3286':
docs: use devsite hdf bool as a javascript condition for managing the lang toggle. sync the sdk and ds templates so we can move toward one template set
Dirk Dougherty [Fri, 1 Feb 2013 21:27:53 +0000 (13:27 -0800)]
am
9c2336e0: Add new droiddoc option for project-specific secondary html input/output paths.
# Via Dirk Dougherty
* commit '
9c2336e073cef13a5237965dc7d5fcdb0091be34':
Add new droiddoc option for project-specific secondary html input/output paths.
Dirk Dougherty [Fri, 1 Feb 2013 21:27:40 +0000 (13:27 -0800)]
am
dc6b4a59: Add templates for devsite docs builds.
# Via Dirk Dougherty
* commit '
dc6b4a591c62f72ee5fea1e3bdadd3584e1eb284':
Add templates for devsite docs builds.
The Android Automerger [Thu, 31 Jan 2013 04:06:22 +0000 (20:06 -0800)]
JDQ30
The Android Automerger [Thu, 31 Jan 2013 04:05:38 +0000 (20:05 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Scott Main [Wed, 30 Jan 2013 23:03:59 +0000 (15:03 -0800)]
docs: fix lang switcher for gae by deleting obsolete method call
Change-Id: I8d91d18e89d539960c93748557cccc5aabb0a263
Scott Main [Tue, 29 Jan 2013 23:12:52 +0000 (15:12 -0800)]
docs: delete obsolete asset files
Change-Id: I1aa8a8fa757dbc81180c0585eacb68df5fe0ceb1
Scott Main [Tue, 29 Jan 2013 21:34:17 +0000 (13:34 -0800)]
docs: update template files with those from the templates-ds directory
Change-Id: I47b07b17ea79d0b00300492ba7854e37f1ab00d0
The Android Automerger [Tue, 29 Jan 2013 22:22:27 +0000 (14:22 -0800)]
JDQ29C
The Android Automerger [Tue, 29 Jan 2013 21:52:21 +0000 (13:52 -0800)]
JDQ29B
The Android Automerger [Tue, 29 Jan 2013 20:58:19 +0000 (12:58 -0800)]
JDQ29
The Android Automerger [Tue, 29 Jan 2013 20:57:58 +0000 (12:57 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Scott Main [Tue, 29 Jan 2013 17:01:52 +0000 (09:01 -0800)]
docs: use devsite hdf bool as a javascript condition for managing the lang toggle.
sync the sdk and ds templates so we can move toward one template set
Change-Id: I5316d4cd085734a47953beba203ba8beeb64549e
The Android Automerger [Tue, 29 Jan 2013 06:18:25 +0000 (22:18 -0800)]
JDQ28
The Android Automerger [Tue, 29 Jan 2013 06:17:51 +0000 (22:17 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Dirk Dougherty [Tue, 29 Jan 2013 02:57:30 +0000 (18:57 -0800)]
Add new droiddoc option for project-specific secondary html input/output paths.
Change-Id: Id9c3dc4e7cfcc26c04e4d1aeb6617e3e6b92114b
Dirk Dougherty [Mon, 28 Jan 2013 22:49:50 +0000 (14:49 -0800)]
Add templates for devsite docs builds.
Change-Id: I0bb0238326aed7d2ff931594709cb153b2587061
The Android Automerger [Thu, 24 Jan 2013 00:29:19 +0000 (16:29 -0800)]
JDQ23
The Android Automerger [Thu, 24 Jan 2013 00:28:43 +0000 (16:28 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
The Android Automerger [Fri, 18 Jan 2013 20:20:38 +0000 (12:20 -0800)]
JDQ18
The Android Automerger [Fri, 18 Jan 2013 20:19:58 +0000 (12:19 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
The Android Automerger [Thu, 17 Jan 2013 00:42:11 +0000 (16:42 -0800)]
JDQ16
The Android Automerger [Thu, 17 Jan 2013 00:41:17 +0000 (16:41 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Scott Main [Tue, 15 Jan 2013 05:07:29 +0000 (21:07 -0800)]
am
eb41035f: docs: add the ability to pause the carousel
* commit '
eb41035fcfe1c223a794a24ee2fe8a8b133e67b1':
docs: add the ability to pause the carousel
Scott Main [Tue, 15 Jan 2013 03:03:40 +0000 (19:03 -0800)]
docs: add the ability to pause the carousel
Change-Id: I1ffc929cf93217b578397d825e1eb41369d2666c
The Android Automerger [Thu, 10 Jan 2013 19:57:20 +0000 (11:57 -0800)]
JDQ10
The Android Automerger [Thu, 10 Jan 2013 19:56:40 +0000 (11:56 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
The Android Automerger [Wed, 9 Jan 2013 23:48:26 +0000 (15:48 -0800)]
JDQ09
The Android Automerger [Wed, 9 Jan 2013 23:47:20 +0000 (15:47 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Scott Main [Wed, 9 Jan 2013 02:49:51 +0000 (18:49 -0800)]
am
869f3d1f: Merge "docs: update analytics script to support event tracking" into jb-mr1-dev
* commit '
869f3d1f68194b5962070394882b85f46a415c4c':
docs: update analytics script to support event tracking
Scott Main [Wed, 9 Jan 2013 02:47:45 +0000 (18:47 -0800)]
Merge "docs: update analytics script to support event tracking" into jb-mr1-dev
Scott Main [Wed, 9 Jan 2013 02:45:08 +0000 (18:45 -0800)]
docs: update analytics script to support event tracking
Change-Id: Ie670a3ae91442ec734d146a76ecab254cb3572d4
Ying Wang [Fri, 4 Jan 2013 22:55:21 +0000 (14:55 -0800)]
am
7dc45a8b: Add simg2img and e2fsck to the otatools.
* commit '
7dc45a8bdc744db4d9c742dc21bfe328ad9ba10f':
Add simg2img and e2fsck to the otatools.
Ying Wang [Fri, 4 Jan 2013 22:43:18 +0000 (14:43 -0800)]
Add simg2img and e2fsck to the otatools.
Change-Id: I31225399c6ef9cae38c825755e301fdc70ce194b
The Android Automerger [Fri, 21 Dec 2012 21:47:17 +0000 (13:47 -0800)]
JDP82
The Android Automerger [Fri, 21 Dec 2012 21:46:40 +0000 (13:46 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
The Android Automerger [Fri, 21 Dec 2012 00:17:20 +0000 (16:17 -0800)]
JDP81B
The Android Automerger [Fri, 21 Dec 2012 00:17:02 +0000 (16:17 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
The Android Automerger [Thu, 20 Dec 2012 22:31:50 +0000 (14:31 -0800)]
JDP81
The Android Automerger [Thu, 20 Dec 2012 22:31:01 +0000 (14:31 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Scott Main [Thu, 20 Dec 2012 03:25:37 +0000 (19:25 -0800)]
am
707909f2: Merge "docs: don\'t allow setting the sidenav fixed if the doc body is shorter than the sidenav. Scrolling won\'t be possible in this case anyway, but this change fixes a glitch that happens on OSX Lion because it will allow scrolling anyway for the overscr
* commit '
707909f2e0fb9ccc0db859ec075a3557f5265e56':
docs: don't allow setting the sidenav fixed if the doc body is shorter than the sidenav. Scrolling won't be possible in this case anyway, but this change fixes a glitch that happens on OSX Lion because it will allow scrolling anyway for the overscroll bounce.
Scott Main [Thu, 20 Dec 2012 03:23:32 +0000 (19:23 -0800)]
Merge "docs: don't allow setting the sidenav fixed if the doc body is shorter than the sidenav. Scrolling won't be possible in this case anyway, but this change fixes a glitch that happens on OSX Lion because it will allow scrolling anyway for the overscroll bounce." into jb-mr1-dev
Scott Main [Thu, 20 Dec 2012 02:38:24 +0000 (18:38 -0800)]
docs: don't allow setting the sidenav fixed if the doc body is
shorter than the sidenav. Scrolling won't be possible in this case
anyway, but this change fixes a glitch that happens on OSX Lion because
it will allow scrolling anyway for the overscroll bounce.
Change-Id: I1be1c170e327f3cdfe81076a473f74425b8bd080
The Android Automerger [Wed, 19 Dec 2012 22:30:14 +0000 (14:30 -0800)]
JDP80B
The Android Automerger [Wed, 19 Dec 2012 22:29:53 +0000 (14:29 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
The Android Automerger [Wed, 19 Dec 2012 21:51:26 +0000 (13:51 -0800)]
JDP80
The Android Automerger [Wed, 19 Dec 2012 21:50:46 +0000 (13:50 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Chad Jones [Wed, 19 Dec 2012 03:40:22 +0000 (19:40 -0800)]
Bump version to JDP79B
Ying Wang [Tue, 18 Dec 2012 23:28:50 +0000 (15:28 -0800)]
am
6a6c1121: Run e2fsck on built sparse images.
* commit '
6a6c11215bdf3f114ed3589ede4bda006adacf7e':
Run e2fsck on built sparse images.
The Android Automerger [Tue, 18 Dec 2012 23:19:35 +0000 (15:19 -0800)]
JDP79
The Android Automerger [Tue, 18 Dec 2012 23:19:02 +0000 (15:19 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
The Android Automerger [Tue, 18 Dec 2012 04:50:14 +0000 (20:50 -0800)]
JDP78
The Android Automerger [Tue, 18 Dec 2012 04:49:28 +0000 (20:49 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
The Android Automerger [Fri, 14 Dec 2012 21:56:39 +0000 (13:56 -0800)]
JDP75
The Android Automerger [Fri, 14 Dec 2012 21:56:02 +0000 (13:56 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
The Android Automerger [Thu, 13 Dec 2012 23:31:33 +0000 (15:31 -0800)]
JDP74
The Android Automerger [Thu, 13 Dec 2012 23:30:36 +0000 (15:30 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
The Android Automerger [Wed, 12 Dec 2012 23:06:52 +0000 (15:06 -0800)]
JDP73
The Android Automerger [Wed, 12 Dec 2012 23:06:00 +0000 (15:06 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
The Android Open Source Project [Wed, 12 Dec 2012 15:38:42 +0000 (07:38 -0800)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I8c4ba6b279cebcc46d7b7cb71c81f1de96962ca9
The Android Automerger [Wed, 12 Dec 2012 07:59:23 +0000 (23:59 -0800)]
JDP72B
The Android Automerger [Tue, 11 Dec 2012 23:57:10 +0000 (15:57 -0800)]
JDP72
The Android Automerger [Tue, 11 Dec 2012 23:56:16 +0000 (15:56 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Ying Wang [Tue, 27 Nov 2012 02:10:23 +0000 (18:10 -0800)]
Run e2fsck on built sparse images.
Bug:
7591683
Change-Id: Id1cba79f7840aab1f0327cb741eda655b45d1b46
The Android Automerger [Tue, 11 Dec 2012 21:59:16 +0000 (13:59 -0800)]
JOP40F
The Android Automerger [Tue, 11 Dec 2012 03:34:09 +0000 (19:34 -0800)]
JDP71B
The Android Automerger [Tue, 11 Dec 2012 03:33:28 +0000 (19:33 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
The Android Automerger [Mon, 10 Dec 2012 21:06:33 +0000 (13:06 -0800)]
JDP71
The Android Automerger [Mon, 10 Dec 2012 21:05:46 +0000 (13:05 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
The Android Automerger [Fri, 7 Dec 2012 21:26:40 +0000 (13:26 -0800)]
JDP68
The Android Automerger [Fri, 7 Dec 2012 21:26:02 +0000 (13:26 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
The Android Automerger [Fri, 7 Dec 2012 03:36:51 +0000 (19:36 -0800)]
JDP67B
The Android Automerger [Fri, 7 Dec 2012 03:35:57 +0000 (19:35 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
The Android Automerger [Thu, 6 Dec 2012 18:40:18 +0000 (10:40 -0800)]
JDP67
The Android Automerger [Thu, 6 Dec 2012 18:39:05 +0000 (10:39 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
OSDN Git Service
