Commit graph

11212 commits

Author SHA1 Message Date
Scott Main
a334cee69d 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
2013-02-01 15:34:17 -08:00
Scott Main
6668404ede 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 2013-02-01 23:32:08 +00:00
Scott Main
c5480c32c2 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
2013-02-01 15:29:44 -08:00
Scott Main
2baf87e4f3 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
2013-02-01 14:29:44 -08:00
Scott Main
20ba728ecb 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
2013-02-01 14:29:43 -08:00
Scott Main
086e7f8b23 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
2013-02-01 14:29:42 -08:00
Dirk Dougherty
34eb13de68 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.
2013-02-01 14:29:41 -08:00
Dirk Dougherty
5bd7d418aa 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.
2013-02-01 14:29:40 -08:00
Scott Main
b88c1a8a05 am 98f23e7a: docs: delete obsolete asset files
# Via Scott Main
* commit '98f23e7af0480b70515552195e359633191f83d8':
  docs: delete obsolete asset files
2013-02-01 13:28:09 -08:00
Scott Main
894423441e 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
2013-02-01 13:28:02 -08:00
Scott Main
79935f593b 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
2013-02-01 13:27:58 -08:00
Dirk Dougherty
18a1a50f98 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.
2013-02-01 13:27:53 -08:00
Dirk Dougherty
9c3033ce0e am dc6b4a59: Add templates for devsite docs builds.
# Via Dirk Dougherty
* commit 'dc6b4a591c62f72ee5fea1e3bdadd3584e1eb284':
  Add templates for devsite docs builds.
2013-02-01 13:27:40 -08:00
The Android Automerger
ee80c57bc4 JDQ30 2013-01-30 20:06:22 -08:00
The Android Automerger
c960e6706c merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2013-01-30 20:05:38 -08:00
Scott Main
77c51357eb docs: fix lang switcher for gae by deleting obsolete method call
Change-Id: I8d91d18e89d539960c93748557cccc5aabb0a263
2013-01-30 15:03:59 -08:00
Scott Main
98f23e7af0 docs: delete obsolete asset files
Change-Id: I1aa8a8fa757dbc81180c0585eacb68df5fe0ceb1
2013-01-29 16:05:55 -08:00
Scott Main
e05e6f99b3 docs: update template files with those from the templates-ds directory
Change-Id: I47b07b17ea79d0b00300492ba7854e37f1ab00d0
2013-01-29 14:45:34 -08:00
The Android Automerger
4335d57ba6 JDQ29C 2013-01-29 14:22:27 -08:00
The Android Automerger
d51b83bb8a JDQ29B 2013-01-29 13:52:21 -08:00
Elliott Hughes
5fb282d89d am 6463953e: am b796ce35: Merge "Remove HAVE_DLADDR from AndroidConfig.h."
# Via Android Git Automerger (1) and others
* commit '6463953e169bbd559cada7263be363202ed40d02':
  Remove HAVE_DLADDR from AndroidConfig.h.
2013-01-29 13:49:55 -08:00
Elliott Hughes
6463953e16 am b796ce35: Merge "Remove HAVE_DLADDR from AndroidConfig.h."
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit 'b796ce353d114328cc16a1f2ad2b1059b03a0c52':
  Remove HAVE_DLADDR from AndroidConfig.h.
2013-01-29 13:47:14 -08:00
Elliott Hughes
b796ce353d Merge "Remove HAVE_DLADDR from AndroidConfig.h." 2013-01-29 21:28:58 +00:00
The Android Automerger
4682f504dd JDQ29 2013-01-29 12:58:19 -08:00
The Android Automerger
677a76071d merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2013-01-29 12:57:58 -08:00
Scott Main
015d616af8 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
2013-01-29 10:43:14 -08:00
The Android Automerger
91f0e5b90b JDQ28 2013-01-28 22:18:25 -08:00
The Android Automerger
0df2fb851d merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2013-01-28 22:17:51 -08:00
Dirk Dougherty
9c2336e073 Add new droiddoc option for project-specific secondary html input/output paths.
Change-Id: Id9c3dc4e7cfcc26c04e4d1aeb6617e3e6b92114b
2013-01-28 19:51:04 -08:00
Dirk Dougherty
dc6b4a591c Add templates for devsite docs builds.
Change-Id: I0bb0238326aed7d2ff931594709cb153b2587061
2013-01-28 14:49:50 -08:00
Ying Wang
46fa45ad76 am cf0a9042: am 9e808ff7: Merge "Use += to append to target-specific PRIVATE_CLEAN_FILES"
# Via Android Git Automerger (1) and others
* commit 'cf0a90426ad969bd2deb66b0c23079842b6c4fa2':
  Use += to append to target-specific PRIVATE_CLEAN_FILES
2013-01-28 11:36:51 -08:00
Ying Wang
cf0a90426a am 9e808ff7: Merge "Use += to append to target-specific PRIVATE_CLEAN_FILES"
# Via Gerrit Code Review (1) and Ying Wang (1)
* commit '9e808ff70515479458d39abfd64ed11eb55fefbb':
  Use += to append to target-specific PRIVATE_CLEAN_FILES
2013-01-28 11:34:56 -08:00
Ying Wang
9e808ff705 Merge "Use += to append to target-specific PRIVATE_CLEAN_FILES" 2013-01-28 19:05:30 +00:00
Ying Wang
eda6ac2487 Use += to append to target-specific PRIVATE_CLEAN_FILES
Instead of incorrectly including global variable PRIVATE_CLEAN_FILES

Change-Id: I9b5e12448dad5001de051a566d8a94a89b20ecac
2013-01-28 10:58:01 -08:00
Elliott Hughes
2988a09f90 Remove HAVE_DLADDR from AndroidConfig.h.
Change-Id: I014ce98c61b12169e381b769af34b682df46087e
2013-01-25 15:57:40 -08:00
The Android Automerger
bb54d9dc4a JDQ23 2013-01-23 16:29:19 -08:00
The Android Automerger
ae15c402a8 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2013-01-23 16:28:43 -08:00
The Android Automerger
2260eafa4e JDQ18 2013-01-18 12:20:38 -08:00
The Android Automerger
fb34d9572a merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2013-01-18 12:19:58 -08:00
Ying Wang
58aee9e30e am 383ecfaf: DO NOT MERGE: Support LOCAL_EXPORT_C_INCLUDE_DIRS for prebuilts too
* commit '383ecfaf023dab1fcab25d97548093e32ef1a564':
  DO NOT MERGE: Support LOCAL_EXPORT_C_INCLUDE_DIRS for prebuilts too
2013-01-17 18:13:08 -08:00
Ying Wang
383ecfaf02 DO NOT MERGE: Support LOCAL_EXPORT_C_INCLUDE_DIRS for prebuilts too
Cherry picked from commit fe3f62d06b
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>
2013-01-17 17:58:18 -08:00
The Android Automerger
71e369e884 JDQ16 2013-01-16 16:42:11 -08:00
The Android Automerger
012b399bbf merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2013-01-16 16:41:17 -08:00
Scott Main
85ab41eb6b am fb959d01: am 474b3f11: am eb41035f: docs: add the ability to pause the carousel
* commit 'fb959d01d56e2d44e8833a8a9beca5ee5b04a24d':
  docs: add the ability to pause the carousel
2013-01-14 21:13:27 -08:00
Scott Main
fb959d01d5 am 474b3f11: am eb41035f: docs: add the ability to pause the carousel
* commit '474b3f1198223b61f912c29d2e5c069dcfe322e0':
  docs: add the ability to pause the carousel
2013-01-14 21:10:48 -08:00
Scott Main
474b3f1198 am eb41035f: docs: add the ability to pause the carousel
* commit 'eb41035fcfe1c223a794a24ee2fe8a8b133e67b1':
  docs: add the ability to pause the carousel
2013-01-14 21:07:29 -08:00
Scott Main
eb41035fcf docs: add the ability to pause the carousel
Change-Id: I1ffc929cf93217b578397d825e1eb41369d2666c
2013-01-14 20:47:40 -08:00
The Android Automerger
2cb5a36421 JDQ10 2013-01-10 11:57:20 -08:00
The Android Automerger
baf217cce5 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2013-01-10 11:56:40 -08:00
The Android Automerger
4dc0571826 JDQ09 2013-01-09 15:48:26 -08:00