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
Scott Main
ac71b2b59b
docs: revisions for google reference nav
...
Change-Id: I9befa502a3ce30ab6cca7d45ce1bb469930c14ed
2012-11-30 14:58:24 -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
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
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
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
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
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
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
Scott Main
1aace7da06
am 502c939f: docs: add support for an infinite number of nested lists in side nav
...
* commit '502c939f6d0818d985a45ca54e35c0a3efa1470b':
docs: add support for an infinite number of nested lists in side nav
2012-11-27 15:09:17 -08:00
Scott Main
502c939f6d
docs: add support for an infinite number of nested lists in side nav
...
Change-Id: I9e0fa672e20067f3e09f56560e7d11847d0b9388
2012-11-27 15:00:40 -08:00
Ying Wang
caee64a98a
am f44a518c: am c69b7735: Put ANDROID_BUILD_PATHS before the system default PATH
...
* commit 'f44a518c104b706c752b671b0308716c7cca73d5':
Put ANDROID_BUILD_PATHS before the system default PATH
2012-11-27 14:18:53 -08:00
Ying Wang
f44a518c10
am c69b7735: Put ANDROID_BUILD_PATHS before the system default PATH
...
* commit 'c69b773506ecf2316059a9fe947bbeb524a402b3':
Put ANDROID_BUILD_PATHS before the system default PATH
2012-11-27 14:17:27 -08:00
Ying Wang
c69b773506
Put ANDROID_BUILD_PATHS before the system default PATH
...
So tools like adb that are built from source won't be overridden by the
host system tools, when you run these tools without specifying the path.
Change-Id: I2f0a288b38fabf57c7a4aa3bae5e42d7b734398d
2012-11-27 14:14:42 -08:00
Keun young Park
490d3f24fc
am d4f8d5e6: replace dummy versions with normal ones for mini
...
* commit 'd4f8d5e64950eb114993a9de975e1519e3509d43':
replace dummy versions with normal ones for mini
2012-11-27 11:31:50 -08:00
The Android Open Source Project
c361ae56dc
am 257fef43: Reconcile with jb-mr1-release - do not merge
...
* commit '257fef430806408dbaca2708018b144d430fbdef':
bump version to 4.2.1
JOP40D
2012-11-27 11:31:33 -08:00
Keun young Park
d4f8d5e649
replace dummy versions with normal ones for mini
...
- no need to hide these UIs any more.
- dummy versions will be removed from the default manifest as well.
Change-Id: I7cebf5bfae65d2e50c9122735fd4e537f5858bec
2012-11-27 10:54:17 -08:00
The Android Open Source Project
257fef4308
Reconcile with jb-mr1-release - do not merge
...
Change-Id: Ic400b5287afc2fcb3a6205e5e57aa89af6572911
2012-11-27 07:33:15 -08:00
Ed Heyl
d4382dd07e
bump version to 4.2.1
...
Change-Id: If8206ec632b4e912433eebdfa4aed8dde8f37cb4
2012-11-19 16:04:18 -08:00
The Android Automerger
476750c763
JOP40D
2012-11-19 16:03:54 -08:00
Ed Heyl
f7306051c1
am 0ddeb0cc: am efcc8b1c: bump version to 4.2.1
...
* commit '0ddeb0ccc1d6dbbb21f9c6d7262d629c3cb8a792':
bump version to 4.2.1
2012-11-19 14:29:37 -08:00
Ed Heyl
0ddeb0ccc1
am efcc8b1c: bump version to 4.2.1
...
* commit 'efcc8b1c79011a6d8ea13774da84c8892cb27e27':
bump version to 4.2.1
2012-11-19 14:26:49 -08:00
Ed Heyl
efcc8b1c79
bump version to 4.2.1
...
Change-Id: If8206ec632b4e912433eebdfa4aed8dde8f37cb4
2012-11-19 14:20:48 -08:00
Scott Main
287d1e42b4
am 6a040270: am 34a4b823: Merge "docs: revise message when api level for docs is too low; make the message appear on package pages as well" into jb-mr1-dev
...
* commit '6a0402701ee9672ef57f3049c3e6d7f5c01095b6':
docs: revise message when api level for docs is too low; make the message appear on package pages as well
2012-11-16 10:48:50 -08:00
Scott Main
6a0402701e
am 34a4b823: Merge "docs: revise message when api level for docs is too low; make the message appear on package pages as well" into jb-mr1-dev
...
* commit '34a4b8239e25103eb796dabd046d821942706b9f':
docs: revise message when api level for docs is too low; make the message appear on package pages as well
2012-11-16 10:45:44 -08:00
Scott Main
34a4b8239e
Merge "docs: revise message when api level for docs is too low; make the message appear on package pages as well" into jb-mr1-dev
2012-11-16 10:43:23 -08:00
