OSDN Git Service

android-x86/build.git
11 years agoadd 64-bit variety NDK packages to download table.
Scott Main [Mon, 18 Mar 2013 18:31:15 +0000 (11:31 -0700)]
add 64-bit variety NDK packages to download table.
Use same naming convention as SDK packages for consistency.

Change-Id: Iee2673d6c9a4b313988e1a73966d2a0fbee27c2c

11 years agotweak jspane width property to ensure bg color for highlighted item is full width
Scott Main [Mon, 11 Mar 2013 16:21:07 +0000 (09:21 -0700)]
tweak jspane width property to ensure bg color for highlighted item is full width

Change-Id: I92e66493229476c29cf71c74091f36063638def4

11 years agoam a07be8ee: switch code font to pure monospace (sans serif). also add proper margins...
Scott Main [Thu, 7 Mar 2013 02:08:37 +0000 (18:08 -0800)]
am a07be8ee: switch code font to pure monospace (sans serif). also add proper margins for elements nested in lists

* commit 'a07be8eee4be0814b866cc79d35bf67cb30768ab':
  switch code font to pure monospace (sans serif). also add proper margins for elements nested in lists

11 years agoswitch code font to pure monospace (sans serif).
Scott Main [Wed, 6 Mar 2013 20:12:21 +0000 (12:12 -0800)]
switch code font to pure monospace (sans serif).
also add proper margins for elements nested in lists

Change-Id: I1c2914904da63d21359283de945c9805f5d4af93

11 years agoam f8333457: Revert "docs: move loading of google ref into doc load event to prevent...
Scott Main [Wed, 27 Feb 2013 06:26:37 +0000 (06:26 +0000)]
am f8333457: Revert "docs: move loading of google ref into doc load event to prevent error during load"

* commit 'f8333457a5ee9abd3d16c9c0abfe0e19e032801f':
  Revert "docs: move loading of google ref into doc load event to prevent error during load"

11 years agoam 578d6446: docs: move loading of google ref into doc load event to prevent error...
Scott Main [Wed, 27 Feb 2013 06:26:36 +0000 (06:26 +0000)]
am 578d6446: docs: move loading of google ref into doc load event to prevent error during load

* commit '578d6446eb1714e17a5ccf55a69379f064ec549a':
  docs: move loading of google ref into doc load event to prevent error during load

11 years agoam 22c22cf7: (-s ours) Reconcile with jb-mr1-release - do not merge
Jean-Baptiste Queru [Wed, 27 Feb 2013 06:26:27 +0000 (06:26 +0000)]
am 22c22cf7: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '22c22cf7e0ae42b6c4fa585341459d9aa3b0c4be':
  Drop official SDK 17
  JOP40G

11 years agoam 9f2971d1: docs: fix suggestions due to file name change for js files
Scott Main [Wed, 27 Feb 2013 06:26:24 +0000 (06:26 +0000)]
am 9f2971d1: docs: fix suggestions due to file name change for js files

* commit '9f2971d1f36e0bffd79033e946ff1378e6ceb309':
  docs: fix suggestions due to file name change for js files

11 years agoam 7e447edf: docs: update search suggest with google services apis including some...
Scott Main [Wed, 27 Feb 2013 06:26:24 +0000 (06:26 +0000)]
am 7e447edf: docs: update search suggest with google services apis including some optimizations for loading javascript resources

* commit '7e447edffa935a3c94978304521099b9ac43b53d':
  docs: update search suggest with google services apis including some optimizations for loading javascript resources

11 years agoam 44281a1f: Add unified fstab support to release tools
Ken Sumrall [Wed, 27 Feb 2013 06:26:07 +0000 (06:26 +0000)]
am 44281a1f: Add unified fstab support to release tools

* commit '44281a1f3ec99d650595b01b34185e1ffb129c6f':
  Add unified fstab support to release tools

11 years agoam d6cb8fac: docs: fix padding for left-figure class
Scott Main [Wed, 27 Feb 2013 06:25:53 +0000 (06:25 +0000)]
am d6cb8fac: docs: fix padding for left-figure class

* commit 'd6cb8fac5397ff6cc114705ad789e29dca9ea1ec':
  docs: fix padding for left-figure class

11 years agoam 0e69c3e4: Merge "docs: add image frame style and left-float figure box" into jb...
Scott Main [Wed, 27 Feb 2013 06:25:52 +0000 (06:25 +0000)]
am 0e69c3e4: Merge "docs: add image frame style and left-float figure box" into jb-mr1-dev

* commit '0e69c3e4e752eb309babe198ebe939e015918401':
  docs: add image frame style and left-float figure box

11 years agoam dae7b523: Revert "support differently named lists.js files"
Robert Ly [Wed, 27 Feb 2013 06:25:52 +0000 (06:25 +0000)]
am dae7b523: Revert "support differently named lists.js files"

* commit 'dae7b523aa1f2b26c42cfb2810a1b8f788ae4301':
  Revert "support differently named lists.js files"

11 years agoRevert "docs: move loading of google ref into doc load event to prevent error during...
Scott Main [Wed, 27 Feb 2013 02:10:20 +0000 (18:10 -0800)]
Revert "docs: move loading of google ref into doc load event to prevent error during load"

This reverts commit 578d6446eb1714e17a5ccf55a69379f064ec549a.

11 years agodocs: move loading of google ref into doc load event to prevent error during load
Scott Main [Tue, 26 Feb 2013 22:46:12 +0000 (14:46 -0800)]
docs: move loading of google ref into doc load event to prevent error during load

Change-Id: Ibe825c25e19f136b2cd58e8a096d13904720e3d2

11 years agoReconcile with jb-mr1-release - do not merge
Jean-Baptiste Queru [Tue, 26 Feb 2013 22:02:57 +0000 (14:02 -0800)]
Reconcile with jb-mr1-release - do not merge

11 years agodocs: fix suggestions due to file name change for js files
Scott Main [Tue, 26 Feb 2013 21:07:41 +0000 (13:07 -0800)]
docs: fix suggestions due to file name change for js files

Change-Id: I4037c80f79f37f7a80d0977b4e07f992e3de61e1

11 years agodocs: update search suggest with google services apis
Scott Main [Wed, 20 Feb 2013 01:22:37 +0000 (17:22 -0800)]
docs: update search suggest with google services apis
including some optimizations for loading javascript resources

Change-Id: Idfea12bbb70a24a7853d997e8376e3db50e56760

11 years agoAdd unified fstab support to release tools
Ken Sumrall [Wed, 20 Feb 2013 01:35:29 +0000 (17:35 -0800)]
Add unified fstab support to release tools

Update the release tools to be able to handle the new unified fstab.

Change-Id: Id9d1810c89aba415e83ae2fc586520f148ec73ef

11 years agodocs: fix padding for left-figure class
Scott Main [Thu, 21 Feb 2013 21:05:03 +0000 (13:05 -0800)]
docs: fix padding for left-figure class

Change-Id: Ic4a1a95410f4d913a278bdb8a75c98ce5c4f5bfd

11 years agoMerge "docs: add image frame style and left-float figure box" into jb-mr1-dev
Scott Main [Thu, 21 Feb 2013 18:53:25 +0000 (18:53 +0000)]
Merge "docs: add image frame style and left-float figure box" into jb-mr1-dev

11 years agodocs: add image frame style and left-float figure box
Scott Main [Thu, 21 Feb 2013 18:52:02 +0000 (10:52 -0800)]
docs: add image frame style and left-float figure box

Change-Id: I9103f6f9e9b416902fbb2add60782ba10ff9e900

11 years agoRevert "support differently named lists.js files"
Robert Ly [Thu, 21 Feb 2013 02:07:00 +0000 (02:07 +0000)]
Revert "support differently named lists.js files"

This reverts commit a6043f76fa41d6062f3ba9e0aae06feb562f8b51

Change-Id: Id7212f9f1ffbe62fd26f97ab6dcea93bcb34e476

11 years agoam a6043f76: support differently named lists.js files
Robert Ly [Wed, 20 Feb 2013 23:17:49 +0000 (15:17 -0800)]
am a6043f76: support differently named lists.js files

* commit 'a6043f76fa41d6062f3ba9e0aae06feb562f8b51':
  support differently named lists.js files

11 years agosupport differently named lists.js files
Robert Ly [Wed, 20 Feb 2013 22:47:44 +0000 (14:47 -0800)]
support differently named lists.js files

Change-Id: Id564c916e891051f73e4c7d7a3683d58a48ee16d

11 years agoInclude Email in emulator system image
Scott Kennedy [Tue, 19 Feb 2013 23:18:49 +0000 (15:18 -0800)]
Include Email in emulator system image

Bug: 8226275
Change-Id: Id7083e06fc1d146b56308d42dc16aad9087f09ad

11 years agoam 769a5d86: docs: re-add dev-docs css because it\'s needed by diff reports
Scott Main [Wed, 13 Feb 2013 19:47:02 +0000 (11:47 -0800)]
am 769a5d86: docs: re-add dev-docs css because it\'s needed by diff reports

# Via Scott Main
* commit '769a5d86987ef54d4b6f11b592100abadbf71756':
  docs: re-add dev-docs css because it's needed by diff reports

11 years agodocs: re-add dev-docs css because it's needed by diff reports
Scott Main [Wed, 13 Feb 2013 19:39:09 +0000 (11:39 -0800)]
docs: re-add dev-docs css because it's needed by diff reports

Change-Id: Ic3f334f5510b008cd1f744823e46fb4fdf5630bd

11 years agoam ac2aef5b: docs: switch templates to dynamic tab highlighting; prep for devsite...
Scott Main [Tue, 12 Feb 2013 22:42:20 +0000 (14:42 -0800)]
am ac2aef5b: docs: switch templates to dynamic tab highlighting; prep for devsite template migration

# Via Scott Main
* commit 'ac2aef5bd880213ead6ad5b467dc0838dd836a5e':
  docs: switch templates to dynamic tab highlighting; prep for devsite template migration

11 years agodocs: switch templates to dynamic tab highlighting; prep for devsite template migration
Scott Main [Tue, 12 Feb 2013 22:15:23 +0000 (14:15 -0800)]
docs: switch templates to dynamic tab highlighting; prep for devsite template migration

Change-Id: I5785c63603d8da5dfa1118fe28a3106aa20835a6

11 years agoam 3062cb88: Merge "docs: udpate JS bundle URL for dac devsite" into jb-mr1-dev
Scott Main [Mon, 11 Feb 2013 19:56:25 +0000 (11:56 -0800)]
am 3062cb88: Merge "docs: udpate JS bundle URL for dac devsite" into jb-mr1-dev

# Via Android (Google) Code Review (1) and Scott Main (1)
* commit '3062cb889b9722922d310ddfbe3d736cb8dff49d':
  docs: udpate JS bundle URL for dac devsite

11 years agoMerge "docs: udpate JS bundle URL for dac devsite" into jb-mr1-dev
Scott Main [Mon, 11 Feb 2013 19:54:11 +0000 (19:54 +0000)]
Merge "docs: udpate JS bundle URL for dac devsite" into jb-mr1-dev

11 years agodocs: udpate JS bundle URL for dac devsite
Scott Main [Mon, 11 Feb 2013 19:42:14 +0000 (11:42 -0800)]
docs: udpate JS bundle URL for dac devsite

Change-Id: I06d8b8536c55581b8e7b2d59c55b3d3069d7fe1d

11 years agoam 9fdf671d: Add LOCAL_ADDITIONAL_HTML_DIR to clear_vars for devsite docs builds.
Dirk Dougherty [Sat, 9 Feb 2013 00:22:04 +0000 (16:22 -0800)]
am 9fdf671d: Add LOCAL_ADDITIONAL_HTML_DIR to clear_vars for devsite docs builds.

# Via Dirk Dougherty
* commit '9fdf671d7f8fb96c1a8d3b41aaf4478e7274e45f':
  Add LOCAL_ADDITIONAL_HTML_DIR to clear_vars for devsite docs builds.

11 years agoAdd LOCAL_ADDITIONAL_HTML_DIR to clear_vars for devsite docs builds.
Dirk Dougherty [Fri, 8 Feb 2013 23:45:45 +0000 (15:45 -0800)]
Add LOCAL_ADDITIONAL_HTML_DIR to clear_vars for devsite docs builds.

Change-Id: Ib75e776d0220a86a08ddd5d7e09edd069af05da1

11 years agoam b7f96375: docs: fix ::selection style to use Android blue for text highlighting
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

11 years agodocs: 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

11 years agoam 6668404e: Merge "docs: minimize code-font line-height. Fixes problem in which...
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.

11 years agoam 77c51357: docs: fix lang switcher for gae by deleting obsolete method call
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

11 years agoMerge "docs: minimize code-font line-height. Fixes problem in which any paragraph...
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

11 years agodocs: minimize code-font line-height.
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

11 years agoam 98f23e7a: docs: delete obsolete asset files
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

11 years agoam e05e6f99: docs: update template files with those from the templates-ds directory
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

11 years agoam 015d616a: docs: use devsite hdf bool as a javascript condition for managing the...
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

11 years agoam 9c2336e0: Add new droiddoc option for project-specific secondary html input/output...
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.

11 years agoam dc6b4a59: Add templates for devsite docs builds.
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.

11 years agoDrop official SDK 17
Ying Wang [Tue, 13 Nov 2012 23:15:12 +0000 (15:15 -0800)]
Drop official SDK 17

The SDK was downloaded with the Eclipse Android SDK Manager.

Change-Id: Ieb26ff03da08fae8a690fc1eb46549bcbe937233

11 years agodocs: fix lang switcher for gae by deleting obsolete method call
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

11 years agodocs: delete obsolete asset files
Scott Main [Tue, 29 Jan 2013 23:12:52 +0000 (15:12 -0800)]
docs: delete obsolete asset files

Change-Id: I1aa8a8fa757dbc81180c0585eacb68df5fe0ceb1

11 years agodocs: update template files with those from the templates-ds directory
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

11 years agodocs: use devsite hdf bool as a javascript condition for managing the lang toggle.
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

11 years agoAdd new droiddoc option for project-specific secondary html input/output paths.
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

11 years agoAdd templates for devsite docs builds.
Dirk Dougherty [Mon, 28 Jan 2013 22:49:50 +0000 (14:49 -0800)]
Add templates for devsite docs builds.

Change-Id: I0bb0238326aed7d2ff931594709cb153b2587061

11 years agoJOP40G
The Android Automerger [Wed, 23 Jan 2013 05:07:10 +0000 (21:07 -0800)]
JOP40G

11 years agoam eb41035f: docs: add the ability to pause the carousel
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

11 years agodocs: 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

11 years agoam 869f3d1f: Merge "docs: update analytics script to support event tracking" into...
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

11 years agoMerge "docs: update analytics script to support event tracking" into jb-mr1-dev
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

11 years agodocs: update analytics script to support event tracking
Scott Main [Wed, 9 Jan 2013 02:45:08 +0000 (18:45 -0800)]
docs: update analytics script to support event tracking

Change-Id: Ie670a3ae91442ec734d146a76ecab254cb3572d4

11 years agoam 7dc45a8b: Add simg2img and e2fsck to the otatools.
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.

11 years agoAdd 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

11 years agoam 707909f2: Merge "docs: don\'t allow setting the sidenav fixed if the doc body...
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.

11 years agoMerge "docs: don't allow setting the sidenav fixed if the doc body is shorter than...
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

11 years agodocs: don't allow setting the sidenav fixed if the doc body is
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

11 years agoam 6a6c1121: Run e2fsck on built sparse images.
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.

11 years agoReconcile with jb-mr1-release - do not merge
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

11 years agoRun e2fsck on built sparse images.
Ying Wang [Tue, 27 Nov 2012 02:10:23 +0000 (18:10 -0800)]
Run e2fsck on built sparse images.

Bug: 7591683
Change-Id: Id1cba79f7840aab1f0327cb741eda655b45d1b46

11 years agoJOP40F
The Android Automerger [Tue, 11 Dec 2012 21:59:16 +0000 (13:59 -0800)]
JOP40F

11 years agoMerge "unbundle photo dreams into the GalleryGoogle package" into jb-mr1.1-dev
Chris Wren [Tue, 4 Dec 2012 01:54:34 +0000 (17:54 -0800)]
Merge "unbundle photo dreams into the GalleryGoogle package" into jb-mr1.1-dev

11 years agoMerge "Obviously JB MR1.1 should be Android 4.2.2." into jb-mr1.1-dev
Dianne Hackborn [Mon, 3 Dec 2012 22:24:04 +0000 (14:24 -0800)]
Merge "Obviously JB MR1.1 should be Android 4.2.2." into jb-mr1.1-dev

11 years agoam 5c0f9e99: Merge "fix docs.js bug where changeApiLevel is getting called" into...
Robert Ly [Mon, 3 Dec 2012 20:59:24 +0000 (12:59 -0800)]
am 5c0f9e99: Merge "fix docs.js bug where changeApiLevel is getting called" into jb-mr1-dev

* commit '5c0f9e996a819806e5f088ded011bd30ef9c46d7':
  fix docs.js bug where changeApiLevel is getting called

11 years agoam f88a53d5: Merge "docs: support google css class for reference docs" into jb-mr1-dev
Robert Ly [Mon, 3 Dec 2012 20:59:24 +0000 (12:59 -0800)]
am f88a53d5: Merge "docs: support google css class for reference docs" into jb-mr1-dev

* commit 'f88a53d5c309adca37210b86e5eb88a4c2706406':
  docs: support google css class for reference docs

11 years agoMerge "fix docs.js bug where changeApiLevel is getting called" into jb-mr1-dev
Robert Ly [Mon, 3 Dec 2012 20:58:14 +0000 (12:58 -0800)]
Merge "fix docs.js bug where changeApiLevel is getting called" into jb-mr1-dev

11 years agoMerge "docs: support google css class for reference docs" into jb-mr1-dev
Robert Ly [Mon, 3 Dec 2012 20:57:50 +0000 (12:57 -0800)]
Merge "docs: support google css class for reference docs" into jb-mr1-dev

11 years agofix docs.js bug where changeApiLevel is getting called
Robert Ly [Mon, 3 Dec 2012 20:53:42 +0000 (12:53 -0800)]
fix docs.js bug where changeApiLevel is getting called

Change-Id: Ic250afc792d7e4174bd987ce31df384dad3831ca

11 years agoam df08adae: docs: add "Google Services" search tab
Scott Main [Mon, 3 Dec 2012 19:53:28 +0000 (11:53 -0800)]
am df08adae: docs: add "Google Services" search tab

* commit 'df08adae5b003bfb056341254c35a16ec9295afe':
  docs: add "Google Services" search tab

11 years agodocs: support google css class for reference docs
Robert Ly [Mon, 3 Dec 2012 19:50:38 +0000 (11:50 -0800)]
docs: support google css class for reference docs

Change-Id: I64e5dc14feb7f045c380e108b6afe44d7b1c8004

11 years agoObviously JB MR1.1 should be Android 4.2.2.
Dianne Hackborn [Fri, 30 Nov 2012 23:43:14 +0000 (15:43 -0800)]
Obviously JB MR1.1 should be Android 4.2.2.

Change-Id: I148817d22d50672a7f204809d11aaf7f0a8af28b

11 years agodocs: add "Google Services" search tab
Scott Main [Mon, 3 Dec 2012 16:54:37 +0000 (08:54 -0800)]
docs: add "Google Services" search tab

Change-Id: I624f99aeb2f760d646f37d783ebb31b5d7d372b8

11 years agounbundle photo dreams into the GalleryGoogle package
Chris Wren [Sun, 2 Dec 2012 18:57:23 +0000 (13:57 -0500)]
unbundle photo dreams into the GalleryGoogle package

Bug: 7559766
Change-Id: I805ba625b6bfc4378ffabfa1d09edab1930dc913

11 years agoam 8fa5351c: show build info only for android docs (not google)
Scott Main [Sat, 1 Dec 2012 04:23:11 +0000 (20:23 -0800)]
am 8fa5351c: show build info only for android docs (not google)

* commit '8fa5351cba16dcac5640f6e0cce794f29e1034f9':
  show build info only for android docs (not google)

11 years agoshow build info only for android docs (not google)
Scott Main [Sat, 1 Dec 2012 04:16:42 +0000 (20:16 -0800)]
show build info only for android docs (not google)

Change-Id: I318f4f68147c109c119ed1fc05c2429ecc7289b7

11 years agoam e0dceabd: Merge "Doc template change: exclude articles from logic to add "prev...
Dirk Dougherty [Fri, 30 Nov 2012 23:40:55 +0000 (15:40 -0800)]
am e0dceabd: Merge "Doc template change: exclude articles from logic to add "prev/next" nav in training docs." into jb-mr1-dev

* commit 'e0dceabdd8a4f56ebf7ae1429350d350bac6d812':
  Doc template change: exclude articles from logic to add "prev/next" nav in training docs.

11 years agoMerge "Doc template change: exclude articles from logic to add "prev/next" nav in...
Dirk Dougherty [Fri, 30 Nov 2012 23:39:03 +0000 (15:39 -0800)]
Merge "Doc template change: exclude articles from logic to add "prev/next" nav in training docs." into jb-mr1-dev

11 years agoam ac71b2b5: docs: revisions for google reference nav
Scott Main [Fri, 30 Nov 2012 23:29:40 +0000 (15:29 -0800)]
am ac71b2b5: docs: revisions for google reference nav

* commit 'ac71b2b59bae525502ae0b7af93b5f3a9f569b47':
  docs: revisions for google reference nav

11 years agodocs: revisions for google reference nav
Scott Main [Fri, 30 Nov 2012 22:40:58 +0000 (14:40 -0800)]
docs: revisions for google reference nav

Change-Id: I9befa502a3ce30ab6cca7d45ce1bb469930c14ed

11 years agoam 8acd75aa: add google class for body
Robert Ly [Fri, 30 Nov 2012 22:34:18 +0000 (14:34 -0800)]
am 8acd75aa: add google class for body

* commit '8acd75aa048dd294d0adce04722851de38d4dcef':
  add google class for body

11 years agoadd google class for body
Robert Ly [Fri, 30 Nov 2012 22:02:43 +0000 (14:02 -0800)]
add google class for body

Change-Id: Ie809df1d207ec08ae232f4ae194959eac69ec5fb

11 years agoDoc template change: exclude articles from logic to add "prev/next" nav in training...
Dirk Dougherty [Fri, 30 Nov 2012 20:44:40 +0000 (12:44 -0800)]
Doc template change: exclude articles from logic to add "prev/next" nav in training docs.

Change-Id: I384c5c5df053d9e98fa953c2e3998e7c99c08569

11 years agoam 5747d38a: enforce margin change for nolist class in training articles
Scott Main [Fri, 30 Nov 2012 20:38:57 +0000 (12:38 -0800)]
am 5747d38a: enforce margin change for nolist class in training articles

* commit '5747d38aad918e32ae485b77524b554fd4e24ae5':
  enforce margin change for nolist class in training articles

11 years agoam 4e477d7b: Merge "docs/css: break words that are too long to fit sidenav; add style...
Scott Main [Fri, 30 Nov 2012 20:38:56 +0000 (12:38 -0800)]
am 4e477d7b: Merge "docs/css: break words that are too long to fit sidenav; add style for google javadocs" into jb-mr1-dev

* commit '4e477d7b9c72555efb2b3fa05b4074a0bf3718b3':
  docs/css: break words that are too long to fit sidenav; add style for google javadocs

11 years agoam d2dd6e58: add support for gms javadocs
Robert Ly [Fri, 30 Nov 2012 20:38:55 +0000 (12:38 -0800)]
am d2dd6e58: add support for gms javadocs

* commit 'd2dd6e58251e1886bd5237d04391559811cfcd66':
  add support for gms javadocs

11 years agoenforce margin change for nolist class in training articles
Scott Main [Fri, 30 Nov 2012 20:02:42 +0000 (12:02 -0800)]
enforce margin change for nolist class in training articles

Change-Id: I7da486d557c3d7629827d2b425fd387366bd7f18

11 years agoMerge "docs/css: break words that are too long to fit sidenav; add style for google...
Scott Main [Fri, 30 Nov 2012 19:32:41 +0000 (11:32 -0800)]
Merge "docs/css: break words that are too long to fit sidenav; add style for google javadocs" into jb-mr1-dev

11 years agodocs/css: break words that are too long to fit sidenav; add style for google javadocs
Scott Main [Fri, 30 Nov 2012 19:27:17 +0000 (11:27 -0800)]
docs/css: break words that are too long to fit sidenav; add style for google javadocs

Change-Id: I69f062c5e1ddeafdae75e8f2ec77226aac836e48

11 years agoadd support for gms javadocs
Robert Ly [Fri, 30 Nov 2012 05:28:48 +0000 (21:28 -0800)]
add support for gms javadocs

Change-Id: Ieecf09794373a176430f554f39e1c632a7013519

11 years agoReconcile with jb-mr1-release - do not merge
The Android Open Source Project [Thu, 29 Nov 2012 19:54:49 +0000 (11:54 -0800)]
Reconcile with jb-mr1-release - do not merge

Change-Id: Ib6d98680f4ca7dacc33209363896f2cdff2127ed

11 years agoJOP40E
The Android Automerger [Thu, 29 Nov 2012 18:45:10 +0000 (10:45 -0800)]
JOP40E

11 years agoam 40e90998: add google services tab
Robert Ly [Thu, 29 Nov 2012 02:15:48 +0000 (18:15 -0800)]
am 40e90998: add google services tab

* commit '40e9099805da2e91ec09c3bab79a7e825fca9d91':
  add google services tab

11 years agoadd google services tab
Robert Ly [Thu, 29 Nov 2012 01:46:17 +0000 (17:46 -0800)]
add google services tab

Change-Id: Ia5b249b825c33334458a6762be2d62b657bc0d58