Commit Graph

10603 Commits

Author SHA1 Message Date
Ying Wang
ead4b642cf am 5f97f2b6: am 6a6c1121: Run e2fsck on built sparse images.
* commit '5f97f2b6d6503eca8ae02ea8941fe1db7b6b399c':
  Run e2fsck on built sparse images.
2012-12-18 15:32:51 -08:00
Ying Wang
5f97f2b6d6 am 6a6c1121: Run e2fsck on built sparse images.
* commit '6a6c11215bdf3f114ed3589ede4bda006adacf7e':
  Run e2fsck on built sparse images.
2012-12-18 15:28:50 -08:00
The Android Open Source Project
b3e8a615d0 am 16cb8655: Reconcile with jb-mr1-release - do not merge
* commit '16cb8655bd96cf32d192acd787d27504153a96ae':
  JOP40F
2012-12-12 07:42:27 -08:00
The Android Open Source Project
16cb8655bd Reconcile with jb-mr1-release - do not merge
Change-Id: I8c4ba6b279cebcc46d7b7cb71c81f1de96962ca9
2012-12-12 07:38:42 -08:00
Ying Wang
6a6c11215b Run e2fsck on built sparse images.
Bug: 7591683
Change-Id: Id1cba79f7840aab1f0327cb741eda655b45d1b46
2012-12-11 14:57:39 -08:00
The Android Automerger
acb046abd0 JOP40F 2012-12-11 13:59:16 -08:00
Chris Wren
abc791fc57 am 801a0792: Merge "unbundle photo dreams into the GalleryGoogle package" into jb-mr1.1-dev
* commit '801a079269d78e29c105462518dd4876dd031b2e':
  unbundle photo dreams into the GalleryGoogle package
2012-12-03 17:56:51 -08:00
Chris Wren
801a079269 Merge "unbundle photo dreams into the GalleryGoogle package" into jb-mr1.1-dev 2012-12-03 17:54:34 -08:00
Dianne Hackborn
d2e4c25e3f am b7157909: Merge "Obviously JB MR1.1 should be Android 4.2.2." into jb-mr1.1-dev
* commit 'b7157909185968064db922bff6d7b1baabe305f4':
  Obviously JB MR1.1 should be Android 4.2.2.
2012-12-03 14:26:03 -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
7bfd28d744 am 4bfc9991: am 5c0f9e99: Merge "fix docs.js bug where changeApiLevel is getting called" into jb-mr1-dev
* commit '4bfc9991b49fe2e4e2e77b61c4abe7e38eea6777':
  fix docs.js bug where changeApiLevel is getting called
2012-12-03 13:00:45 -08:00
Robert Ly
54c5928772 am fd3b957b: am f88a53d5: Merge "docs: support google css class for reference docs" into jb-mr1-dev
* commit 'fd3b957b4a63504e31801367056a0fb954e15c9c':
  docs: support google css class for reference docs
2012-12-03 13:00:44 -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
f8ea5ec7cd am 838b0856: am df08adae: docs: add "Google Services" search tab
* commit '838b0856405949c03bd27f08441755055d2b4b89':
  docs: add "Google Services" search tab
2012-12-03 11:55:05 -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
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
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