Scott Main
0a24bca9f5
am 18ae42f3
: am 468a239d
: am 8d0a978a
: am 869f3d1f
: Merge "docs: update analytics script to support event tracking" into jb-mr1-dev
...
* commit '18ae42f3c84744eca9fd96afcbcf365427e1578f':
docs: update analytics script to support event tracking
2013-01-10 15:38:23 -08:00
Scott Main
18ae42f3c8
am 468a239d
: am 8d0a978a
: am 869f3d1f
: Merge "docs: update analytics script to support event tracking" into jb-mr1-dev
...
* commit '468a239d0cc522623f1896b3837092f629393292':
docs: update analytics script to support event tracking
2013-01-08 18:59:29 -08:00
Scott Main
468a239d0c
am 8d0a978a
: am 869f3d1f
: Merge "docs: update analytics script to support event tracking" into jb-mr1-dev
...
* commit '8d0a978aea9110bcb6f0d28e504ad1a9540acbe4':
docs: update analytics script to support event tracking
2013-01-08 18:56:40 -08:00
Scott Main
869f3d1f68
Merge "docs: update analytics script to support event tracking" into jb-mr1-dev
2013-01-08 18:47:45 -08:00
Scott Main
ae3ee424e1
docs: update analytics script to support event tracking
...
Change-Id: Ie670a3ae91442ec734d146a76ecab254cb3572d4
2013-01-08 18:45:08 -08:00
Doug Zongker
4c84eb37ff
am 96045fb5
: am f09b7a0e
: Merge "SignApk: perform the whole file signature in a single streaming pass."
...
* commit '96045fb58488a24689e7449700c53614d9336572':
SignApk: perform the whole file signature in a single streaming pass.
2013-01-03 15:19:19 -08:00
Doug Zongker
96045fb584
am f09b7a0e
: Merge "SignApk: perform the whole file signature in a single streaming pass."
...
* commit 'f09b7a0eaa0aa2ae6a1d0e1cf0f701f1f56e0cda':
SignApk: perform the whole file signature in a single streaming pass.
2013-01-03 15:12:43 -08:00
Koushik Dutta
29706d155a
SignApk: perform the whole file signature in a single streaming pass.
...
Author: Koushik Dutta <koushd@gmail.com>
Change-Id: I58a68fa4bd4c0c3bb0e025d4311186195fb90e5a
2013-01-03 14:00:40 -08:00
Doug Zongker
2d867bd207
am 57a5e52d
: Merge "add multiple key support to signapk"
...
* commit '57a5e52d3692b5f7e4008c8e6aa591aee67de130':
add multiple key support to signapk
2013-01-02 14:45:12 -08:00
Doug Zongker
b14c97621b
add multiple key support to signapk
...
Support signing .apks (but not OTA packages) with multiple keys.
Bug: 7350459
Change-Id: I794e1da0555e2bb9247a59c756656d4ca7ee04cf
2013-01-02 13:31:00 -08:00
Scott Main
f9b6e097cb
am 97654bc6
: am db3da9bb
: am c9cea375
: am 707909f2
: Merge "docs: don\'t allow setting the sidenav fixed if the doc body is shorter than the sidenav. Scrolling won\'t be possible in this case anyway, but this change fixes a glitch that happens on OSX Lion because it wi
...
* commit '97654bc68fe98ec443599b46fa0ad2c518fa4875':
docs: don't allow setting the sidenav fixed if the doc body is shorter than the sidenav. Scrolling won't be possible in this case anyway, but this change fixes a glitch that happens on OSX Lion because it will allow scrolling anyway for the overscroll bounce.
2012-12-19 19:32:13 -08:00
Scott Main
97654bc68f
am db3da9bb
: am c9cea375
: am 707909f2
: Merge "docs: don\'t allow setting the sidenav fixed if the doc body is shorter than the sidenav. Scrolling won\'t be possible in this case anyway, but this change fixes a glitch that happens on OSX Lion because it will allow scro
...
* commit 'db3da9bbc62be22d96cdf61f02afe271174f50be':
docs: don't allow setting the sidenav fixed if the doc body is shorter than the sidenav. Scrolling won't be possible in this case anyway, but this change fixes a glitch that happens on OSX Lion because it will allow scrolling anyway for the overscroll bounce.
2012-12-19 19:31:12 -08:00
Scott Main
db3da9bbc6
am c9cea375
: am 707909f2
: Merge "docs: don\'t allow setting the sidenav fixed if the doc body is shorter than the sidenav. Scrolling won\'t be possible in this case anyway, but this change fixes a glitch that happens on OSX Lion because it will allow scrolling anyway
...
* commit 'c9cea375c3c66df33f4535e986c00a68f390ac62':
docs: don't allow setting the sidenav fixed if the doc body is shorter than the sidenav. Scrolling won't be possible in this case anyway, but this change fixes a glitch that happens on OSX Lion because it will allow scrolling anyway for the overscroll bounce.
2012-12-19 19:29:21 -08:00
Scott Main
707909f2e0
Merge "docs: don't allow setting the sidenav fixed if the doc body is shorter than the sidenav. Scrolling won't be possible in this case anyway, but this change fixes a glitch that happens on OSX Lion because it will allow scrolling anyway for the overscroll bounce." into jb-mr1-dev
2012-12-19 19:23:32 -08:00
Scott Main
b8d06a55e0
docs: don't allow setting the sidenav fixed if the doc body is
...
shorter than the sidenav. Scrolling won't be possible in this case
anyway, but this change fixes a glitch that happens on OSX Lion because
it will allow scrolling anyway for the overscroll bounce.
Change-Id: I1be1c170e327f3cdfe81076a473f74425b8bd080
2012-12-19 18:42:16 -08:00
Ying Wang
c46bd076ff
am ead4b642
: am 5f97f2b6
: am 6a6c1121
: Run e2fsck on built sparse images.
...
* commit 'ead4b642cffe258e08326628af2c83c99c14df1f':
Run e2fsck on built sparse images.
2012-12-18 23:09:09 -08:00
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
6a6c11215b
Run e2fsck on built sparse images.
...
Bug: 7591683
Change-Id: Id1cba79f7840aab1f0327cb741eda655b45d1b46
2012-12-11 14:57:39 -08:00
Ben Cheng
96ddf10e33
am 297e28a9
: am a7b85086
: Merge "Export TARGET_GCC_VERSION as an env variable."
...
* commit '297e28a9a713346dfb5d91630c96d365a6e69750':
Export TARGET_GCC_VERSION as an env variable.
2012-12-10 17:36:35 -08:00
Ben Cheng
297e28a9a7
am a7b85086
: Merge "Export TARGET_GCC_VERSION as an env variable."
...
* commit 'a7b850864c54bb6f223d4b186c5937fd20aa68d8':
Export TARGET_GCC_VERSION as an env variable.
2012-12-10 17:02:27 -08:00
Ben Cheng
1526670628
Export TARGET_GCC_VERSION as an env variable.
...
Have it referenced by the adbs tool to pick the specified toolchain.
Change-Id: I23df88946254a55d0749d6753e54559faf33e121
2012-12-10 16:06:16 -08:00
Robert Ly
04fc926d1e
am 70b80f2a
: am 7bfd28d7
: am 4bfc9991
: am 5c0f9e99
: Merge "fix docs.js bug where changeApiLevel is getting called" into jb-mr1-dev
...
* commit '70b80f2a9efb7ff52e6ece8626cc13c222474d90':
fix docs.js bug where changeApiLevel is getting called
2012-12-03 13:07:35 -08:00
Robert Ly
c60c594c1d
am b1202d15
: am 54c59287
: am fd3b957b
: am f88a53d5
: Merge "docs: support google css class for reference docs" into jb-mr1-dev
...
* commit 'b1202d1512440b9122fc5a318222825af7787ca5':
docs: support google css class for reference docs
2012-12-03 13:07:34 -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
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
bc09aed1be
am b1fb4417
: am f8ea5ec7
: am 838b0856
: am df08adae
: docs: add "Google Services" search tab
...
* commit 'b1fb4417131e2e511f7df426edcda34114674d66':
docs: add "Google Services" search tab
2012-12-03 11:59:40 -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
Robert Ly
06884f596c
docs: support google css class for reference docs
...
Change-Id: I64e5dc14feb7f045c380e108b6afe44d7b1c8004
2012-12-03 11:50:38 -08:00
Scott Main
df08adae5b
docs: add "Google Services" search tab
...
Change-Id: I624f99aeb2f760d646f37d783ebb31b5d7d372b8
2012-12-03 08:54:37 -08:00
Scott Main
2b1fa59c74
am 2a2eb040
: am a5d5c010
: am 408067be
: am 8fa5351c
: show build info only for android docs (not google)
...
* commit '2a2eb040a640ca3ef2f9b10d0449a431bad3ced1':
show build info only for android docs (not google)
2012-11-30 20:28:41 -08: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
8fa5351cba
show build info only for android docs (not google)
...
Change-Id: I318f4f68147c109c119ed1fc05c2429ecc7289b7
2012-11-30 20:19:37 -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
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
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
ac71b2b59b
docs: revisions for google reference nav
...
Change-Id: I9befa502a3ce30ab6cca7d45ce1bb469930c14ed
2012-11-30 14:58:24 -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
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
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
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