Commit Graph

11435 Commits

Author SHA1 Message Date
Scott Main a5d5c01010 am 408067be: am 8fa5351c: show build info only for android docs (not google)
* commit '408067be215fa98ecad4de0aea2c080417c4e4f1':
  show build info only for android docs (not google)
2012-11-30 20:25:19 -08:00
Scott Main 408067be21 am 8fa5351c: show build info only for android docs (not google)
* commit '8fa5351cba16dcac5640f6e0cce794f29e1034f9':
  show build info only for android docs (not google)
2012-11-30 20:23:11 -08:00
Scott Main 8fa5351cba show build info only for android docs (not google)
Change-Id: I318f4f68147c109c119ed1fc05c2429ecc7289b7
2012-11-30 20:19:37 -08:00
The Android Automerger b1110e6ffb JDP60D 2012-11-30 16:19:57 -08:00
Dirk Dougherty 0173056f47 am 3e847379: am 6e181e99: 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 '3e847379aa6ece5cf991b8b0039a55443de40e6b':
  Doc template change: exclude articles from logic to add "prev/next" nav in training docs.
2012-11-30 15:52:32 -08:00
Scott Main 1d333b1784 am da65c4c3: am cdb4807e: am 0504ec1e: am ac71b2b5: docs: revisions for google reference nav
* commit 'da65c4c30222f90ba52fa65ec9e9a0095b7caf8c':
  docs: revisions for google reference nav
2012-11-30 15:52:22 -08:00
Dirk Dougherty 3e847379aa am 6e181e99: 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 '6e181e99423757cfaa4ab393461c8f1d392c7bb7':
  Doc template change: exclude articles from logic to add "prev/next" nav in training docs.
2012-11-30 15:46:07 -08:00
Scott Main da65c4c302 am cdb4807e: am 0504ec1e: am ac71b2b5: docs: revisions for google reference nav
* commit 'cdb4807e64ae8ab200e5a1b61b238ee186826a83':
  docs: revisions for google reference nav
2012-11-30 15:44:14 -08:00
Dirk Dougherty 6e181e9942 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.
2012-11-30 15:43:14 -08:00
Scott Main cdb4807e64 am 0504ec1e: am ac71b2b5: docs: revisions for google reference nav
* commit '0504ec1e80d6eb40fa9b7d3a25da9f9b82b703aa':
  docs: revisions for google reference nav
2012-11-30 15:41:14 -08:00
Dirk Dougherty 2b61bc38ee 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.
2012-11-30 15:40:55 -08:00
Dirk Dougherty e0dceabdd8 Merge "Doc template change: exclude articles from logic to add "prev/next" nav in training docs." into jb-mr1-dev 2012-11-30 15:39:03 -08:00
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 02ce23e292 am 097eaf90: (-s ours) Reconcile with jb-mr1.1-release - do not merge
* commit '097eaf9026c0a8d02b1586a2611b5be350c1a285':
  JDP60C
2012-11-30 15:01:43 -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 bfba2df684 am 54ab8f4f: am bcd7ba84: am ee9dea65: am 8acd75aa: add google class for body
* commit '54ab8f4f52261f074cab5e3b513c610be4a717c5':
  add google class for body
2012-11-30 14:38:12 -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 ef1930ed7e am 06820a3a: am f5df12fc: am cddbc098: am 5747d38a: enforce margin change for nolist class in training articles
* commit '06820a3adbd6c5e67ae4b21235ff73cf4a06d46a':
  enforce margin change for nolist class in training articles
2012-11-30 13:25:56 -08:00
Scott Main f97ad3dba9 am b09a0447: 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 'b09a04476ccb169163ff80fef97360b928ef3ce7':
  docs/css: break words that are too long to fit sidenav; add style for google javadocs
2012-11-30 13:25:55 -08:00
Robert Ly e520c82a8c am 3339ad12: am b2542514: am ef8764da: am d2dd6e58: add support for gms javadocs
* commit '3339ad12e114511dcf3bfd6ed187b762a9c1b99a':
  add support for gms javadocs
2012-11-30 13:25:54 -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 53e39eca5e am 1630826e: (-s ours) Reconcile with jb-mr1.1-release - do not merge
* commit '1630826edbdf92a903a2f16693d12d4b02d17678':
  JDP60B
  JDP60
2012-11-29 15:42:33 -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 01ccbe775b am 875443d4: (-s ours) am 0ee58582: am afac6c90: Reconcile with jb-mr1-release - do not merge
* commit '875443d4b56226cf7f4f5155f4c4b6f8293f6f57':
  JOP40E
2012-11-29 14:36:44 -08:00
Robert Ly 890658429d am e76962d8: am 9cdd3ca5: am b3748f31: am 40e90998: add google services tab
* commit 'e76962d8d3e84ed2f1593d341d294aa20e824f3b':
  add google services tab
2012-11-29 14:36:42 -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 527e6127a6 am 8eb2bad5: am f8728e66: Merge "Add emulator modules to PRODUCT_PACKAGES in full and sdk products"
* commit '8eb2bad59852fddbf7cd77ccdb18411691c6c0f1':
  Add emulator modules to PRODUCT_PACKAGES in full and sdk products
2012-11-29 10:22:46 -08:00