Commit Graph

11158 Commits

Author SHA1 Message Date
Scott Main
0504ec1e80 am ac71b2b5: docs: revisions for google reference nav
* commit 'ac71b2b59bae525502ae0b7af93b5f3a9f569b47':
  docs: revisions for google reference nav
2012-11-30 15:29:40 -08:00
The Android Open Source Project
097eaf9026 Reconcile with jb-mr1.1-release - do not merge
Change-Id: I3e6dea054ed56ef2477198ee2082f97433d359c2
2012-11-30 14:59:45 -08:00
Scott Main
ac71b2b59b docs: revisions for google reference nav
Change-Id: I9befa502a3ce30ab6cca7d45ce1bb469930c14ed
2012-11-30 14:58:24 -08:00
The Android Automerger
408149aa6a JDP60C 2012-11-30 14:56:25 -08:00
Robert Ly
54ab8f4f52 am bcd7ba84: am ee9dea65: am 8acd75aa: add google class for body
* commit 'bcd7ba840c66f5fc4ebc87d59dfca3db4ec12fe4':
  add google class for body
2012-11-30 14:36:34 -08:00
Robert Ly
bcd7ba840c am ee9dea65: am 8acd75aa: add google class for body
* commit 'ee9dea657ab7cb3fa4308f7ee8a7609b40907df1':
  add google class for body
2012-11-30 14:35:42 -08:00
Robert Ly
ee9dea657a am 8acd75aa: add google class for body
* commit '8acd75aa048dd294d0adce04722851de38d4dcef':
  add google class for body
2012-11-30 14:34:18 -08:00
Robert Ly
8acd75aa04 add google class for body
Change-Id: Ie809df1d207ec08ae232f4ae194959eac69ec5fb
2012-11-30 14:02:43 -08:00
Scott Main
06820a3adb am f5df12fc: am cddbc098: am 5747d38a: enforce margin change for nolist class in training articles
* commit 'f5df12fcba931838d94b43ce276947fe7805cc46':
  enforce margin change for nolist class in training articles
2012-11-30 13:21:42 -08:00
Scott Main
b09a04476c am 529e7ca4: am 1e2934b0: am 4e477d7b: Merge "docs/css: break words that are too long to fit sidenav; add style for google javadocs" into jb-mr1-dev
* commit '529e7ca47af38606a462667851645bde3fc14aa0':
  docs/css: break words that are too long to fit sidenav; add style for google javadocs
2012-11-30 13:21:29 -08:00
Robert Ly
3339ad12e1 am b2542514: am ef8764da: am d2dd6e58: add support for gms javadocs
* commit 'b25425148d0964bf16532a82ca4e4e096759759d':
  add support for gms javadocs
2012-11-30 13:21:27 -08:00
Scott Main
f5df12fcba am cddbc098: am 5747d38a: enforce margin change for nolist class in training articles
* commit 'cddbc0985319a1f6e2279121cfbd3b873b8b71c6':
  enforce margin change for nolist class in training articles
2012-11-30 13:17:03 -08:00
Scott Main
529e7ca47a am 1e2934b0: am 4e477d7b: Merge "docs/css: break words that are too long to fit sidenav; add style for google javadocs" into jb-mr1-dev
* commit '1e2934b048a36b8172715893193a84bde8667b00':
  docs/css: break words that are too long to fit sidenav; add style for google javadocs
2012-11-30 13:17:02 -08:00
Robert Ly
b25425148d am ef8764da: am d2dd6e58: add support for gms javadocs
* commit 'ef8764da3a4290edabf4ae2cb4e36d90a6cddcfd':
  add support for gms javadocs
2012-11-30 13:17:01 -08:00
Dirk Dougherty
18dca5d058 Doc template change: exclude articles from logic to add "prev/next" nav in training docs.
Change-Id: I384c5c5df053d9e98fa953c2e3998e7c99c08569
2012-11-30 12:44:40 -08:00
Scott Main
cddbc09853 am 5747d38a: enforce margin change for nolist class in training articles
* commit '5747d38aad918e32ae485b77524b554fd4e24ae5':
  enforce margin change for nolist class in training articles
2012-11-30 12:38:57 -08:00
Scott Main
1e2934b048 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
2012-11-30 12:38:56 -08:00
Robert Ly
ef8764da3a am d2dd6e58: add support for gms javadocs
* commit 'd2dd6e58251e1886bd5237d04391559811cfcd66':
  add support for gms javadocs
2012-11-30 12:38:55 -08:00
Scott Main
5747d38aad enforce margin change for nolist class in training articles
Change-Id: I7da486d557c3d7629827d2b425fd387366bd7f18
2012-11-30 12:02:42 -08:00
Scott Main
4e477d7b9c Merge "docs/css: break words that are too long to fit sidenav; add style for google javadocs" into jb-mr1-dev 2012-11-30 11:32:42 -08:00
Scott Main
ab4daf4f58 docs/css: break words that are too long to fit sidenav; add style for google javadocs
Change-Id: I69f062c5e1ddeafdae75e8f2ec77226aac836e48
2012-11-30 11:27:17 -08:00
Robert Ly
d2dd6e5825 add support for gms javadocs
Change-Id: Ieecf09794373a176430f554f39e1c632a7013519
2012-11-30 03:22:25 -08:00
The Android Open Source Project
1630826edb Reconcile with jb-mr1.1-release - do not merge
Change-Id: I6bcb489de05ebc91846cec20d8d645e12cc846da
2012-11-29 15:40:34 -08:00
The Android Open Source Project
875443d4b5 am 0ee58582: am afac6c90: Reconcile with jb-mr1-release - do not merge
* commit '0ee5858203a93d39db3e929a9c5cbe77f92c8412':
  JOP40E
2012-11-29 14:28:19 -08:00
Robert Ly
e76962d8d3 am 9cdd3ca5: am b3748f31: am 40e90998: add google services tab
* commit '9cdd3ca577ca2636178711387a88b779ba82dcd3':
  add google services tab
2012-11-29 14:26:26 -08:00
The Android Automerger
94592655f5 JDP60B 2012-11-29 14:01:12 -08:00
The Android Open Source Project
0ee5858203 am afac6c90: Reconcile with jb-mr1-release - do not merge
* commit 'afac6c903d01fe2564b52b08287f44e2d5b3f04e':
  JOP40E
2012-11-29 11:56:32 -08:00
The Android Open Source Project
afac6c903d Reconcile with jb-mr1-release - do not merge
Change-Id: Ib6d98680f4ca7dacc33209363896f2cdff2127ed
2012-11-29 11:54:49 -08:00
The Android Automerger
fd74ba5175 JOP40E 2012-11-29 10:45:10 -08:00
Jesse Hall
8eb2bad598 am f8728e66: Merge "Add emulator modules to PRODUCT_PACKAGES in full and sdk products"
* commit 'f8728e66222a00146ba87e800ccdb776cb9e5156':
  Add emulator modules to PRODUCT_PACKAGES in full and sdk products
2012-11-29 10:19:58 -08:00
Jesse Hall
f8728e6622 Merge "Add emulator modules to PRODUCT_PACKAGES in full and sdk products" 2012-11-29 10:06:04 -08:00
The Android Automerger
1493ad7c10 JDP60 2012-11-29 07:10:53 -08:00
The Android Automerger
1c38cdc95c merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-11-29 07:09:13 -08:00
Robert Ly
9cdd3ca577 am b3748f31: am 40e90998: add google services tab
* commit 'b3748f317af6f19447763489800576c23a244544':
  add google services tab
2012-11-28 18:18:37 -08:00
Robert Ly
b3748f317a am 40e90998: add google services tab
* commit '40e9099805da2e91ec09c3bab79a7e825fca9d91':
  add google services tab
2012-11-28 18:15:48 -08:00
Robert Ly
40e9099805 add google services tab
Change-Id: Ia5b249b825c33334458a6762be2d62b657bc0d58
2012-11-28 17:58:58 -08:00
Jesse Hall
229b137564 Add emulator modules to PRODUCT_PACKAGES in full and sdk products
Bug: 7556265
Change-Id: Ie84f5ed6b17cccea7e6181f16686e2aac6955f1a
2012-11-28 11:27:53 -08:00
Scott Main
e6f3c03321 am 36f6da28: am 7942a936: am d4cb7831: add \'external-link\' class for links that go off-site
* commit '36f6da28304b06dcface33461042efbf02098af7':
  add 'external-link' class for links that go off-site
2012-11-28 11:16:47 -08:00
Scott Main
36f6da2830 am 7942a936: am d4cb7831: add \'external-link\' class for links that go off-site
* commit '7942a936797e414adbe71a022a1053d8e7ac156c':
  add 'external-link' class for links that go off-site
2012-11-28 11:15:20 -08:00
Scott Main
7942a93679 am d4cb7831: add \'external-link\' class for links that go off-site
* commit 'd4cb783159c76d0ea9423020b3ab6ec77a21506e':
  add 'external-link' class for links that go off-site
2012-11-28 11:14:20 -08:00
Scott Main
d4cb783159 add 'external-link' class for links that go off-site
Change-Id: I9e78cd6a7cb2ce14e5e15fe43e87b55ac456f302
2012-11-28 11:10:09 -08:00
The Android Open Source Project
d457787f7a Reconcile with jb-mr1.1-release - do not merge
Change-Id: I66e912b35d44f05c4fdb6686bcde4a5396aa352d
2012-11-28 09:47:11 -08:00
Robert Ly
44686feb7b am 1e351764: am 50a8ce10: am 7d131e0a: fix build
* commit '1e351764624ae82fc8cacb622808bc13a8ce03c5':
  fix build
2012-11-27 17:37:05 -08:00
Robert Ly
1e35176462 am 50a8ce10: am 7d131e0a: fix build
* commit '50a8ce108bee7b530eaf25624d3f20ffbab76253':
  fix build
2012-11-27 17:35:16 -08:00
Robert Ly
50a8ce108b am 7d131e0a: fix build
* commit '7d131e0ad6695d1b46ab7854277fdbbf523f3d29':
  fix build
2012-11-27 17:33:27 -08:00
Robert Ly
7d131e0ad6 fix build
Change-Id: I3e98493aac48b0061d44351fb8c0f07a759b25c0
2012-11-27 17:27:34 -08:00
The Android Automerger
2febef697e JDP58 2012-11-27 15:35:46 -08:00
The Android Automerger
7c761e2a14 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-11-27 15:34:09 -08:00
Scott Main
32bde8fd70 am 0a7c8e2b: am 1aace7da: am 502c939f: docs: add support for an infinite number of nested lists in side nav
* commit '0a7c8e2be18dc4ee4b2093538793948601e40b0a':
  docs: add support for an infinite number of nested lists in side nav
2012-11-27 15:12:00 -08:00
Scott Main
0a7c8e2be1 am 1aace7da: am 502c939f: docs: add support for an infinite number of nested lists in side nav
* commit '1aace7da06b4f9d4c5024a18accf99b2e4be0fb3':
  docs: add support for an infinite number of nested lists in side nav
2012-11-27 15:10:17 -08:00