OSDN Git Service
Scott Main [Thu, 21 Feb 2013 22:28:56 +0000 (14:28 -0800)]
am
245a4f64: am
0e69c3e4: Merge "docs: add image frame style and left-float figure box" into jb-mr1-dev
* commit '
245a4f644c79f584ac205240069c15d5afd77d8b':
docs: add image frame style and left-float figure box
Robert Ly [Thu, 21 Feb 2013 22:28:55 +0000 (14:28 -0800)]
am
eb8edf43: am
dae7b523: Revert "support differently named lists.js files"
* commit '
eb8edf43a12c4ef1f9ad6667c33960d9a3a52db0':
Revert "support differently named lists.js files"
Scott Main [Thu, 21 Feb 2013 22:18:08 +0000 (14:18 -0800)]
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
Robert Ly [Thu, 21 Feb 2013 22:18:07 +0000 (14:18 -0800)]
am
dae7b523: Revert "support differently named lists.js files"
* commit '
dae7b523aa1f2b26c42cfb2810a1b8f788ae4301':
Revert "support differently named lists.js files"
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
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
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
Robert Ly [Wed, 20 Feb 2013 23:22:22 +0000 (15:22 -0800)]
am
2b878f60: am
a6043f76: support differently named lists.js files
* commit '
2b878f60c9e668b8a31d58ac8c89307b5b4faa45':
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
Robert Ly [Wed, 20 Feb 2013 22:47:44 +0000 (14:47 -0800)]
support differently named lists.js files
Change-Id: Id564c916e891051f73e4c7d7a3683d58a48ee16d
Scott Kennedy [Wed, 20 Feb 2013 00:21:35 +0000 (16:21 -0800)]
am
ad1862c1: Include Email in emulator system image
* commit '
ad1862c1876936bfe125bf1faad0a92e9675e9f2':
Include 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
Scott Main [Wed, 13 Feb 2013 19:50:36 +0000 (11:50 -0800)]
am
76fa47d6: am
769a5d86: docs: re-add dev-docs css because it\'s needed by diff reports
# Via Android Git Automerger (1) and Scott Main (1)
* commit '
76fa47d606f084676908aeeb4ffbc44f17398e43':
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
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
Scott Main [Tue, 12 Feb 2013 22:46:10 +0000 (14:46 -0800)]
am
40e30da7: am
ac2aef5b: docs: switch templates to dynamic tab highlighting; prep for devsite template migration
# Via Android Git Automerger (1) and Scott Main (1)
* commit '
40e30da78a7551b91674cc41ac134146b85daa22':
docs: switch templates to dynamic tab highlighting; prep for devsite template migration
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
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
Scott Main [Mon, 11 Feb 2013 20:00:21 +0000 (12:00 -0800)]
am
33925453: am
3062cb88: Merge "docs: udpate JS bundle URL for dac devsite" into jb-mr1-dev
# Via Android (Google) Code Review (1) and others
* commit '
339254537d99c0fef145fc60add9d5b94a0e651a':
docs: udpate JS bundle URL for dac devsite
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
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
Scott Main [Mon, 11 Feb 2013 19:42:14 +0000 (11:42 -0800)]
docs: udpate JS bundle URL for dac devsite
Change-Id: I06d8b8536c55581b8e7b2d59c55b3d3069d7fe1d
Dirk Dougherty [Sat, 9 Feb 2013 00:27:11 +0000 (16:27 -0800)]
am
061c758c: am
9fdf671d: Add LOCAL_ADDITIONAL_HTML_DIR to clear_vars for devsite docs builds.
# Via Android Git Automerger (1) and Dirk Dougherty (1)
* commit '
061c758cfa5409035854804efa1e0c4d32d2f007':
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.
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
Scott Main [Fri, 8 Feb 2013 01:05:25 +0000 (17:05 -0800)]
am
8359d2c4: am
b7f96375: docs: fix ::selection style to use Android blue for text highlighting
# Via Android Git Automerger (1) and Scott Main (1)
* commit '
8359d2c4e98df00f66712c79efe3216059f5424d':
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
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
Scott Main [Fri, 1 Feb 2013 23:41:22 +0000 (15:41 -0800)]
am
7257c71f: 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 others
* commit '
7257c71fa86f6d65fab9fae4b9fd76c2f6ba3b70':
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:41:21 +0000 (15:41 -0800)]
am
a334cee6: am
77c51357: docs: fix lang switcher for gae by deleting obsolete method call
# Via Android Git Automerger (1) and Scott Main (1)
* commit '
a334cee69d787ca3fb22a790f002443c02804176':
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
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 22:29:44 +0000 (14:29 -0800)]
am
b88c1a8a: am
98f23e7a: docs: delete obsolete asset files
# Via Android Git Automerger (1) and Scott Main (1)
* commit '
b88c1a8a053a2274b315bc83c5f7e1c4d5666f68':
docs: delete obsolete asset files
Scott Main [Fri, 1 Feb 2013 22:29:43 +0000 (14:29 -0800)]
am
89442344: am
e05e6f99: docs: update template files with those from the templates-ds directory
# Via Android Git Automerger (1) and Scott Main (1)
* commit '
894423441edeb5ff431c1c82db8fa42ab25a27f7':
docs: update template files with those from the templates-ds directory
Scott Main [Fri, 1 Feb 2013 22:29:42 +0000 (14:29 -0800)]
am
79935f59: 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 Android Git Automerger (1) and Scott Main (1)
* commit '
79935f593bc567517c95d0f09198a519f315b2ca':
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 22:29:41 +0000 (14:29 -0800)]
am
18a1a50f: am
9c2336e0: Add new droiddoc option for project-specific secondary html input/output paths.
# Via Android Git Automerger (1) and Dirk Dougherty (1)
* commit '
18a1a50f981449bb3dbd6bab3ee2502b51259fd7':
Add new droiddoc option for project-specific secondary html input/output paths.
Dirk Dougherty [Fri, 1 Feb 2013 22:29:40 +0000 (14:29 -0800)]
am
9c3033ce: am
dc6b4a59: Add templates for devsite docs builds.
# Via Android Git Automerger (1) and Dirk Dougherty (1)
* commit '
9c3033ce0e099b8722cb8524ee52b6bce2e46506':
Add templates for devsite docs builds.
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.
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
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
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
Ying Wang [Tue, 4 Dec 2012 02:24:55 +0000 (18:24 -0800)]
DO NOT MERGE: Support LOCAL_EXPORT_C_INCLUDE_DIRS for prebuilts too
Cherry picked from commit
fe3f62d06b77888cddf0365a40b20835eeac221f
in master. Since this is already in master, and we're upstream,
set to DO NOT MERGE.
Change-Id: I09e8e849f642792e3a74e2564820ab9bbf1eb28c
Signed-off-by: Mike J. Chen <mjchen@google.com>
Scott Main [Tue, 15 Jan 2013 05:10:48 +0000 (21:10 -0800)]
am
474b3f11: am
eb41035f: docs: add the ability to pause the carousel
* commit '
474b3f1198223b61f912c29d2e5c069dcfe322e0':
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
Scott Main [Tue, 15 Jan 2013 03:03:40 +0000 (19:03 -0800)]
docs: add the ability to pause the carousel
Change-Id: I1ffc929cf93217b578397d825e1eb41369d2666c
Scott Main [Wed, 9 Jan 2013 02:56:40 +0000 (18:56 -0800)]
am
8d0a978a: am
869f3d1f: Merge "docs: update analytics script to support event tracking" into jb-mr1-dev
* commit '
8d0a978aea9110bcb6f0d28e504ad1a9540acbe4':
docs: update analytics script to support event tracking
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:59:20 +0000 (14:59 -0800)]
am
a6f10400: am
7dc45a8b: Add simg2img and e2fsck to the otatools.
* commit '
a6f10400e16e80529e2dbbcd44742e55a99e0c3b':
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.
Ying Wang [Fri, 4 Jan 2013 22:43:18 +0000 (14:43 -0800)]
Add simg2img and e2fsck to the otatools.
Change-Id: I31225399c6ef9cae38c825755e301fdc70ce194b
Scott Main [Thu, 20 Dec 2012 03:29:21 +0000 (19:29 -0800)]
am
c9cea375: 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
* commit '
c9cea375c3c66df33f4535e986c00a68f390ac62':
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: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
Ying Wang [Tue, 18 Dec 2012 23:32:51 +0000 (15:32 -0800)]
am
5f97f2b6: am
6a6c1121: Run e2fsck on built sparse images.
* commit '
5f97f2b6d6503eca8ae02ea8941fe1db7b6b399c':
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.
The Android Open Source Project [Wed, 12 Dec 2012 15:42:27 +0000 (07:42 -0800)]
am
16cb8655: Reconcile with jb-mr1-release - do not merge
* commit '
16cb8655bd96cf32d192acd787d27504153a96ae':
JOP40F
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
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
Chris Wren [Tue, 4 Dec 2012 01:56:51 +0000 (17:56 -0800)]
am
801a0792: Merge "unbundle photo dreams into the GalleryGoogle package" into jb-mr1.1-dev
* commit '
801a079269d78e29c105462518dd4876dd031b2e':
unbundle photo dreams into the GalleryGoogle package
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
Dianne Hackborn [Mon, 3 Dec 2012 22:26:03 +0000 (14:26 -0800)]
am
b7157909: Merge "Obviously JB MR1.1 should be Android 4.2.2." into jb-mr1.1-dev
* commit '
b7157909185968064db922bff6d7b1baabe305f4':
Obviously JB MR1.1 should be Android 4.2.2.
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
Robert Ly [Mon, 3 Dec 2012 21:00:45 +0000 (13:00 -0800)]
am
4bfc9991: am
5c0f9e99: Merge "fix docs.js bug where changeApiLevel is getting called" into jb-mr1-dev
* commit '
4bfc9991b49fe2e4e2e77b61c4abe7e38eea6777':
fix docs.js bug where changeApiLevel is getting called
Robert Ly [Mon, 3 Dec 2012 21:00:44 +0000 (13:00 -0800)]
am
fd3b957b: am
f88a53d5: Merge "docs: support google css class for reference docs" into jb-mr1-dev
* commit '
fd3b957b4a63504e31801367056a0fb954e15c9c':
docs: support google css class for reference docs
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
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
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
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
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
Scott Main [Mon, 3 Dec 2012 19:55:05 +0000 (11:55 -0800)]
am
838b0856: am
df08adae: docs: add "Google Services" search tab
* commit '
838b0856405949c03bd27f08441755055d2b4b89':
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
Robert Ly [Mon, 3 Dec 2012 19:50:38 +0000 (11:50 -0800)]
docs: support google css class for reference docs
Change-Id: I64e5dc14feb7f045c380e108b6afe44d7b1c8004
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
Scott Main [Mon, 3 Dec 2012 16:54:37 +0000 (08:54 -0800)]
docs: add "Google Services" search tab
Change-Id: I624f99aeb2f760d646f37d783ebb31b5d7d372b8
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
Scott Main [Sat, 1 Dec 2012 04:25:19 +0000 (20:25 -0800)]
am
408067be: am
8fa5351c: show build info only for android docs (not google)
* commit '
408067be215fa98ecad4de0aea2c080417c4e4f1':
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)
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
Dirk Dougherty [Fri, 30 Nov 2012 23:43:14 +0000 (15:43 -0800)]
am
2b61bc38: am
e0dceabd: Merge "Doc template change: exclude articles from logic to add "prev/next" nav in training docs." into jb-mr1-dev
* commit '
2b61bc38ee3221446a62314f8e830e0228026e86':
Doc template change: exclude articles from logic to add "prev/next" nav in training docs.
Scott Main [Fri, 30 Nov 2012 23:41:14 +0000 (15:41 -0800)]
am
0504ec1e: am
ac71b2b5: docs: revisions for google reference nav
* commit '
0504ec1e80d6eb40fa9b7d3a25da9f9b82b703aa':
docs: revisions for google reference nav
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.
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
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
Scott Main [Fri, 30 Nov 2012 22:40:58 +0000 (14:40 -0800)]
docs: revisions for google reference nav
Change-Id: I9befa502a3ce30ab6cca7d45ce1bb469930c14ed
Robert Ly [Fri, 30 Nov 2012 22:35:42 +0000 (14:35 -0800)]
am
ee9dea65: am
8acd75aa: add google class for body
* commit '
ee9dea657ab7cb3fa4308f7ee8a7609b40907df1':
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
Robert Ly [Fri, 30 Nov 2012 22:02:43 +0000 (14:02 -0800)]
add google class for body
Change-Id: Ie809df1d207ec08ae232f4ae194959eac69ec5fb