The Android Automerger
e21aec999d
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2012-12-03 15:54:17 -08:00
Dianne Hackborn
b715790918
Merge "Obviously JB MR1.1 should be Android 4.2.2." into jb-mr1.1-dev
2012-12-03 14:24:04 -08:00
Robert Ly
4bfc9991b4
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
2012-12-03 12:59:24 -08:00
Robert Ly
fd3b957b4a
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
2012-12-03 12:59:24 -08:00
Robert Ly
5c0f9e996a
Merge "fix docs.js bug where changeApiLevel is getting called" into jb-mr1-dev
2012-12-03 12:58:15 -08:00
Robert Ly
f88a53d5c3
Merge "docs: support google css class for reference docs" into jb-mr1-dev
2012-12-03 12:57:50 -08:00
Robert Ly
67d75f16f4
fix docs.js bug where changeApiLevel is getting called
...
Change-Id: Ic250afc792d7e4174bd987ce31df384dad3831ca
2012-12-03 12:55:48 -08:00
Scott Main
838b085640
am df08adae: docs: add "Google Services" search tab
...
* commit 'df08adae5b003bfb056341254c35a16ec9295afe':
docs: add "Google Services" search tab
2012-12-03 11:53:28 -08:00
Robert Ly
06884f596c
docs: support google css class for reference docs
...
Change-Id: I64e5dc14feb7f045c380e108b6afe44d7b1c8004
2012-12-03 11:50:38 -08:00
Dianne Hackborn
aa48e74b60
Obviously JB MR1.1 should be Android 4.2.2.
...
Change-Id: I148817d22d50672a7f204809d11aaf7f0a8af28b
2012-12-03 11:07:37 -08:00
Scott Main
df08adae5b
docs: add "Google Services" search tab
...
Change-Id: I624f99aeb2f760d646f37d783ebb31b5d7d372b8
2012-12-03 08:54:37 -08:00
Chris Wren
d2827ae0a8
unbundle photo dreams into the GalleryGoogle package
...
Bug: 7559766
Change-Id: I805ba625b6bfc4378ffabfa1d09edab1930dc913
2012-12-03 11:36:55 -05:00
The Android Automerger
dc64b2eb71
JDP64
2012-12-03 06:08:05 -08:00
The Android Automerger
e4ac051c63
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2012-12-03 06:06:24 -08:00
The Android Automerger
58089996ac
JDP60E
2012-12-01 17:21:58 -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
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
The Android Automerger
408149aa6a
JDP60C
2012-11-30 14:56:25 -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
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 Automerger
94592655f5
JDP60B
2012-11-29 14:01:12 -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
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
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
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
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
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
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
