OSDN Git Service
Dirk Dougherty [Fri, 1 Feb 2013 22:29:40 +0000 (14:29 -0800)]
am
9c3033ce: am
dc6b4a59: Add templates for devsite docs builds.
# Via Android Git Automerger (1) and Dirk Dougherty (1)
* commit '
9c3033ce0e099b8722cb8524ee52b6bce2e46506':
Add templates for devsite docs builds.
Dirk Dougherty [Fri, 1 Feb 2013 21:27:40 +0000 (13:27 -0800)]
am
dc6b4a59: Add templates for devsite docs builds.
# Via Dirk Dougherty
* commit '
dc6b4a591c62f72ee5fea1e3bdadd3584e1eb284':
Add templates for devsite docs builds.
Dirk Dougherty [Mon, 28 Jan 2013 22:49:50 +0000 (14:49 -0800)]
Add templates for devsite docs builds.
Change-Id: I0bb0238326aed7d2ff931594709cb153b2587061
Ying Wang [Tue, 4 Dec 2012 02:24:55 +0000 (18:24 -0800)]
DO NOT MERGE: Support LOCAL_EXPORT_C_INCLUDE_DIRS for prebuilts too
Cherry picked from commit
fe3f62d06b77888cddf0365a40b20835eeac221f
in master. Since this is already in master, and we're upstream,
set to DO NOT MERGE.
Change-Id: I09e8e849f642792e3a74e2564820ab9bbf1eb28c
Signed-off-by: Mike J. Chen <mjchen@google.com>
Scott Main [Tue, 15 Jan 2013 05:10:48 +0000 (21:10 -0800)]
am
474b3f11: am
eb41035f: docs: add the ability to pause the carousel
* commit '
474b3f1198223b61f912c29d2e5c069dcfe322e0':
docs: add the ability to pause the carousel
Scott Main [Tue, 15 Jan 2013 05:07:29 +0000 (21:07 -0800)]
am
eb41035f: docs: add the ability to pause the carousel
* commit '
eb41035fcfe1c223a794a24ee2fe8a8b133e67b1':
docs: add the ability to pause the carousel
Scott Main [Tue, 15 Jan 2013 03:03:40 +0000 (19:03 -0800)]
docs: add the ability to pause the carousel
Change-Id: I1ffc929cf93217b578397d825e1eb41369d2666c
Scott Main [Wed, 9 Jan 2013 02:56:40 +0000 (18:56 -0800)]
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
Scott Main [Wed, 9 Jan 2013 02:49:51 +0000 (18:49 -0800)]
am
869f3d1f: Merge "docs: update analytics script to support event tracking" into jb-mr1-dev
* commit '
869f3d1f68194b5962070394882b85f46a415c4c':
docs: update analytics script to support event tracking
Scott Main [Wed, 9 Jan 2013 02:47:45 +0000 (18:47 -0800)]
Merge "docs: update analytics script to support event tracking" into jb-mr1-dev
Scott Main [Wed, 9 Jan 2013 02:45:08 +0000 (18:45 -0800)]
docs: update analytics script to support event tracking
Change-Id: Ie670a3ae91442ec734d146a76ecab254cb3572d4
Ying Wang [Fri, 4 Jan 2013 22:59:20 +0000 (14:59 -0800)]
am
a6f10400: am
7dc45a8b: Add simg2img and e2fsck to the otatools.
* commit '
a6f10400e16e80529e2dbbcd44742e55a99e0c3b':
Add simg2img and e2fsck to the otatools.
Ying Wang [Fri, 4 Jan 2013 22:55:21 +0000 (14:55 -0800)]
am
7dc45a8b: Add simg2img and e2fsck to the otatools.
* commit '
7dc45a8bdc744db4d9c742dc21bfe328ad9ba10f':
Add simg2img and e2fsck to the otatools.
Ying Wang [Fri, 4 Jan 2013 22:43:18 +0000 (14:43 -0800)]
Add simg2img and e2fsck to the otatools.
Change-Id: I31225399c6ef9cae38c825755e301fdc70ce194b
Scott Main [Thu, 20 Dec 2012 03:29:21 +0000 (19:29 -0800)]
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.
Scott Main [Thu, 20 Dec 2012 03:25:37 +0000 (19:25 -0800)]
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 for the overscr
* commit '
707909f2e0fb9ccc0db859ec075a3557f5265e56':
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.
Scott Main [Thu, 20 Dec 2012 03:23:32 +0000 (19:23 -0800)]
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
Scott Main [Thu, 20 Dec 2012 02:38:24 +0000 (18:38 -0800)]
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
Ying Wang [Tue, 18 Dec 2012 23:32:51 +0000 (15:32 -0800)]
am
5f97f2b6: am
6a6c1121: Run e2fsck on built sparse images.
* commit '
5f97f2b6d6503eca8ae02ea8941fe1db7b6b399c':
Run e2fsck on built sparse images.
Ying Wang [Tue, 18 Dec 2012 23:28:50 +0000 (15:28 -0800)]
am
6a6c1121: Run e2fsck on built sparse images.
* commit '
6a6c11215bdf3f114ed3589ede4bda006adacf7e':
Run e2fsck on built sparse images.
The Android Open Source Project [Wed, 12 Dec 2012 15:42:27 +0000 (07:42 -0800)]
am
16cb8655: Reconcile with jb-mr1-release - do not merge
* commit '
16cb8655bd96cf32d192acd787d27504153a96ae':
JOP40F
The Android Open Source Project [Wed, 12 Dec 2012 15:38:42 +0000 (07:38 -0800)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I8c4ba6b279cebcc46d7b7cb71c81f1de96962ca9
Ying Wang [Tue, 27 Nov 2012 02:10:23 +0000 (18:10 -0800)]
Run e2fsck on built sparse images.
Bug:
7591683
Change-Id: Id1cba79f7840aab1f0327cb741eda655b45d1b46
The Android Automerger [Tue, 11 Dec 2012 21:59:16 +0000 (13:59 -0800)]
JOP40F
Chris Wren [Tue, 4 Dec 2012 01:56:51 +0000 (17:56 -0800)]
am
801a0792: Merge "unbundle photo dreams into the GalleryGoogle package" into jb-mr1.1-dev
* commit '
801a079269d78e29c105462518dd4876dd031b2e':
unbundle photo dreams into the GalleryGoogle package
Chris Wren [Tue, 4 Dec 2012 01:54:34 +0000 (17:54 -0800)]
Merge "unbundle photo dreams into the GalleryGoogle package" into jb-mr1.1-dev
Dianne Hackborn [Mon, 3 Dec 2012 22:26:03 +0000 (14:26 -0800)]
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.
Dianne Hackborn [Mon, 3 Dec 2012 22:24:04 +0000 (14:24 -0800)]
Merge "Obviously JB MR1.1 should be Android 4.2.2." into jb-mr1.1-dev
Robert Ly [Mon, 3 Dec 2012 21:00:45 +0000 (13:00 -0800)]
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
Robert Ly [Mon, 3 Dec 2012 21:00:44 +0000 (13:00 -0800)]
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
Robert Ly [Mon, 3 Dec 2012 20:59:24 +0000 (12:59 -0800)]
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
Robert Ly [Mon, 3 Dec 2012 20:59:24 +0000 (12:59 -0800)]
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
Robert Ly [Mon, 3 Dec 2012 20:58:14 +0000 (12:58 -0800)]
Merge "fix docs.js bug where changeApiLevel is getting called" into jb-mr1-dev
Robert Ly [Mon, 3 Dec 2012 20:57:50 +0000 (12:57 -0800)]
Merge "docs: support google css class for reference docs" into jb-mr1-dev
Robert Ly [Mon, 3 Dec 2012 20:53:42 +0000 (12:53 -0800)]
fix docs.js bug where changeApiLevel is getting called
Change-Id: Ic250afc792d7e4174bd987ce31df384dad3831ca
Scott Main [Mon, 3 Dec 2012 19:55:05 +0000 (11:55 -0800)]
am
838b0856: am
df08adae: docs: add "Google Services" search tab
* commit '
838b0856405949c03bd27f08441755055d2b4b89':
docs: add "Google Services" search tab
Scott Main [Mon, 3 Dec 2012 19:53:28 +0000 (11:53 -0800)]
am
df08adae: docs: add "Google Services" search tab
* commit '
df08adae5b003bfb056341254c35a16ec9295afe':
docs: add "Google Services" search tab
Robert Ly [Mon, 3 Dec 2012 19:50:38 +0000 (11:50 -0800)]
docs: support google css class for reference docs
Change-Id: I64e5dc14feb7f045c380e108b6afe44d7b1c8004
Dianne Hackborn [Fri, 30 Nov 2012 23:43:14 +0000 (15:43 -0800)]
Obviously JB MR1.1 should be Android 4.2.2.
Change-Id: I148817d22d50672a7f204809d11aaf7f0a8af28b
Scott Main [Mon, 3 Dec 2012 16:54:37 +0000 (08:54 -0800)]
docs: add "Google Services" search tab
Change-Id: I624f99aeb2f760d646f37d783ebb31b5d7d372b8
Chris Wren [Sun, 2 Dec 2012 18:57:23 +0000 (13:57 -0500)]
unbundle photo dreams into the GalleryGoogle package
Bug:
7559766
Change-Id: I805ba625b6bfc4378ffabfa1d09edab1930dc913
Scott Main [Sat, 1 Dec 2012 04:25:19 +0000 (20:25 -0800)]
am
408067be: am
8fa5351c: show build info only for android docs (not google)
* commit '
408067be215fa98ecad4de0aea2c080417c4e4f1':
show build info only for android docs (not google)
Scott Main [Sat, 1 Dec 2012 04:23:11 +0000 (20:23 -0800)]
am
8fa5351c: show build info only for android docs (not google)
* commit '
8fa5351cba16dcac5640f6e0cce794f29e1034f9':
show build info only for android docs (not google)
Scott Main [Sat, 1 Dec 2012 04:16:42 +0000 (20:16 -0800)]
show build info only for android docs (not google)
Change-Id: I318f4f68147c109c119ed1fc05c2429ecc7289b7
Dirk Dougherty [Fri, 30 Nov 2012 23:43:14 +0000 (15:43 -0800)]
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.
Scott Main [Fri, 30 Nov 2012 23:41:14 +0000 (15:41 -0800)]
am
0504ec1e: am
ac71b2b5: docs: revisions for google reference nav
* commit '
0504ec1e80d6eb40fa9b7d3a25da9f9b82b703aa':
docs: revisions for google reference nav
Dirk Dougherty [Fri, 30 Nov 2012 23:40:55 +0000 (15:40 -0800)]
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.
Dirk Dougherty [Fri, 30 Nov 2012 23:39:03 +0000 (15:39 -0800)]
Merge "Doc template change: exclude articles from logic to add "prev/next" nav in training docs." into jb-mr1-dev
Scott Main [Fri, 30 Nov 2012 23:29:40 +0000 (15:29 -0800)]
am
ac71b2b5: docs: revisions for google reference nav
* commit '
ac71b2b59bae525502ae0b7af93b5f3a9f569b47':
docs: revisions for google reference nav
Scott Main [Fri, 30 Nov 2012 22:40:58 +0000 (14:40 -0800)]
docs: revisions for google reference nav
Change-Id: I9befa502a3ce30ab6cca7d45ce1bb469930c14ed
Robert Ly [Fri, 30 Nov 2012 22:35:42 +0000 (14:35 -0800)]
am
ee9dea65: am
8acd75aa: add google class for body
* commit '
ee9dea657ab7cb3fa4308f7ee8a7609b40907df1':
add google class for body
Robert Ly [Fri, 30 Nov 2012 22:34:18 +0000 (14:34 -0800)]
am
8acd75aa: add google class for body
* commit '
8acd75aa048dd294d0adce04722851de38d4dcef':
add google class for body
Robert Ly [Fri, 30 Nov 2012 22:02:43 +0000 (14:02 -0800)]
add google class for body
Change-Id: Ie809df1d207ec08ae232f4ae194959eac69ec5fb
Scott Main [Fri, 30 Nov 2012 21:17:03 +0000 (13:17 -0800)]
am
cddbc098: am
5747d38a: enforce margin change for nolist class in training articles
* commit '
cddbc0985319a1f6e2279121cfbd3b873b8b71c6':
enforce margin change for nolist class in training articles
Scott Main [Fri, 30 Nov 2012 21:17:02 +0000 (13:17 -0800)]
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
Robert Ly [Fri, 30 Nov 2012 21:17:01 +0000 (13:17 -0800)]
am
ef8764da: am
d2dd6e58: add support for gms javadocs
* commit '
ef8764da3a4290edabf4ae2cb4e36d90a6cddcfd':
add support for gms javadocs
Dirk Dougherty [Fri, 30 Nov 2012 20:44:40 +0000 (12:44 -0800)]
Doc template change: exclude articles from logic to add "prev/next" nav in training docs.
Change-Id: I384c5c5df053d9e98fa953c2e3998e7c99c08569
Scott Main [Fri, 30 Nov 2012 20:38:57 +0000 (12:38 -0800)]
am
5747d38a: enforce margin change for nolist class in training articles
* commit '
5747d38aad918e32ae485b77524b554fd4e24ae5':
enforce margin change for nolist class in training articles
Scott Main [Fri, 30 Nov 2012 20:38:56 +0000 (12:38 -0800)]
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
Robert Ly [Fri, 30 Nov 2012 20:38:55 +0000 (12:38 -0800)]
am
d2dd6e58: add support for gms javadocs
* commit '
d2dd6e58251e1886bd5237d04391559811cfcd66':
add support for gms javadocs
Scott Main [Fri, 30 Nov 2012 20:02:42 +0000 (12:02 -0800)]
enforce margin change for nolist class in training articles
Change-Id: I7da486d557c3d7629827d2b425fd387366bd7f18
Scott Main [Fri, 30 Nov 2012 19:32:41 +0000 (11:32 -0800)]
Merge "docs/css: break words that are too long to fit sidenav; add style for google javadocs" into jb-mr1-dev
Scott Main [Fri, 30 Nov 2012 19:27:17 +0000 (11:27 -0800)]
docs/css: break words that are too long to fit sidenav; add style for google javadocs
Change-Id: I69f062c5e1ddeafdae75e8f2ec77226aac836e48
Robert Ly [Fri, 30 Nov 2012 05:28:48 +0000 (21:28 -0800)]
add support for gms javadocs
Change-Id: Ieecf09794373a176430f554f39e1c632a7013519
The Android Open Source Project [Thu, 29 Nov 2012 19:56:32 +0000 (11:56 -0800)]
am
afac6c90: Reconcile with jb-mr1-release - do not merge
* commit '
afac6c903d01fe2564b52b08287f44e2d5b3f04e':
JOP40E
The Android Open Source Project [Thu, 29 Nov 2012 19:54:49 +0000 (11:54 -0800)]
Reconcile with jb-mr1-release - do not merge
Change-Id: Ib6d98680f4ca7dacc33209363896f2cdff2127ed
The Android Automerger [Thu, 29 Nov 2012 18:45:10 +0000 (10:45 -0800)]
JOP40E
Robert Ly [Thu, 29 Nov 2012 02:18:37 +0000 (18:18 -0800)]
am
b3748f31: am
40e90998: add google services tab
* commit '
b3748f317af6f19447763489800576c23a244544':
add google services tab
Robert Ly [Thu, 29 Nov 2012 02:15:48 +0000 (18:15 -0800)]
am
40e90998: add google services tab
* commit '
40e9099805da2e91ec09c3bab79a7e825fca9d91':
add google services tab
Robert Ly [Thu, 29 Nov 2012 01:46:17 +0000 (17:46 -0800)]
add google services tab
Change-Id: Ia5b249b825c33334458a6762be2d62b657bc0d58
Scott Main [Wed, 28 Nov 2012 19:15:20 +0000 (11:15 -0800)]
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
Scott Main [Wed, 28 Nov 2012 19:14:20 +0000 (11:14 -0800)]
am
d4cb7831: add \'external-link\' class for links that go off-site
* commit '
d4cb783159c76d0ea9423020b3ab6ec77a21506e':
add 'external-link' class for links that go off-site
Scott Main [Wed, 28 Nov 2012 19:10:09 +0000 (11:10 -0800)]
add 'external-link' class for links that go off-site
Change-Id: I9e78cd6a7cb2ce14e5e15fe43e87b55ac456f302
Robert Ly [Wed, 28 Nov 2012 01:35:16 +0000 (17:35 -0800)]
Robert Ly [Wed, 28 Nov 2012 01:33:27 +0000 (17:33 -0800)]
Robert Ly [Wed, 28 Nov 2012 01:27:34 +0000 (17:27 -0800)]
fix build
Change-Id: I3e98493aac48b0061d44351fb8c0f07a759b25c0
Scott Main [Tue, 27 Nov 2012 23:10:17 +0000 (15:10 -0800)]
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
Scott Main [Tue, 27 Nov 2012 23:09:17 +0000 (15:09 -0800)]
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
Scott Main [Tue, 27 Nov 2012 23:00:40 +0000 (15:00 -0800)]
docs: add support for an infinite number of nested lists in side nav
Change-Id: I9e0fa672e20067f3e09f56560e7d11847d0b9388
Ying Wang [Tue, 27 Nov 2012 22:18:53 +0000 (14:18 -0800)]
am
f44a518c: am
c69b7735: Put ANDROID_BUILD_PATHS before the system default PATH
* commit '
f44a518c104b706c752b671b0308716c7cca73d5':
Put ANDROID_BUILD_PATHS before the system default PATH
Ying Wang [Tue, 27 Nov 2012 22:17:27 +0000 (14:17 -0800)]
am
c69b7735: Put ANDROID_BUILD_PATHS before the system default PATH
* commit '
c69b773506ecf2316059a9fe947bbeb524a402b3':
Put ANDROID_BUILD_PATHS before the system default PATH
Ying Wang [Tue, 27 Nov 2012 04:51:59 +0000 (20:51 -0800)]
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
Keun young Park [Tue, 27 Nov 2012 19:31:50 +0000 (11:31 -0800)]
am
d4f8d5e6: replace dummy versions with normal ones for mini
* commit '
d4f8d5e64950eb114993a9de975e1519e3509d43':
replace dummy versions with normal ones for mini
The Android Open Source Project [Tue, 27 Nov 2012 19:31:33 +0000 (11:31 -0800)]
am
257fef43: Reconcile with jb-mr1-release - do not merge
* commit '
257fef430806408dbaca2708018b144d430fbdef':
bump version to 4.2.1
JOP40D
Keun young Park [Tue, 27 Nov 2012 18:52:14 +0000 (10:52 -0800)]
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
The Android Open Source Project [Tue, 27 Nov 2012 15:33:15 +0000 (07:33 -0800)]
Reconcile with jb-mr1-release - do not merge
Change-Id: Ic400b5287afc2fcb3a6205e5e57aa89af6572911
Ed Heyl [Mon, 19 Nov 2012 22:20:48 +0000 (14:20 -0800)]
bump version to 4.2.1
Change-Id: If8206ec632b4e912433eebdfa4aed8dde8f37cb4
The Android Automerger [Tue, 20 Nov 2012 00:03:54 +0000 (16:03 -0800)]
JOP40D
Ed Heyl [Mon, 19 Nov 2012 22:29:37 +0000 (14:29 -0800)]
am
0ddeb0cc: am
efcc8b1c: bump version to 4.2.1
* commit '
0ddeb0ccc1d6dbbb21f9c6d7262d629c3cb8a792':
bump version to 4.2.1
Ed Heyl [Mon, 19 Nov 2012 22:26:49 +0000 (14:26 -0800)]
am
efcc8b1c: bump version to 4.2.1
* commit '
efcc8b1c79011a6d8ea13774da84c8892cb27e27':
bump version to 4.2.1
Ed Heyl [Mon, 19 Nov 2012 22:20:48 +0000 (14:20 -0800)]
bump version to 4.2.1
Change-Id: If8206ec632b4e912433eebdfa4aed8dde8f37cb4
Scott Main [Fri, 16 Nov 2012 18:48:50 +0000 (10:48 -0800)]
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
Scott Main [Fri, 16 Nov 2012 18:45:44 +0000 (10:45 -0800)]
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
Scott Main [Fri, 16 Nov 2012 18:43:23 +0000 (10:43 -0800)]
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
Scott Main [Fri, 16 Nov 2012 18:34:22 +0000 (10:34 -0800)]
docs: revise message when api level for docs is too low;
make the message appear on package pages as well
Change-Id: I9e71d4054e2e14efe9646029ac0a18022ec24fb2
Guang Zhu [Fri, 16 Nov 2012 01:57:58 +0000 (17:57 -0800)]
am
f0d4d8f3: DO NOT MERGE: change build id to JB MR1.1
* commit '
f0d4d8f32934df6dc859e2b668d436d67b388cd2':
DO NOT MERGE: change build id to JB MR1.1
Guang Zhu [Fri, 16 Nov 2012 01:47:53 +0000 (17:47 -0800)]
DO NOT MERGE: change build id to JB MR1.1
Among other things, this helps monitoring of automated tests, to
properly show which branch the device is running on
Change-Id: I8bb8e3ec347849da44d29ce502b09a593d61ae0e
Scott Main [Thu, 15 Nov 2012 23:23:43 +0000 (15:23 -0800)]
am
1f0850ee: am
11ac05bb: docs: add script for 32/64-bit bundle downloads
* commit '
1f0850ee04dcb54e0969f40f692ae00f1da5843b':
docs: add script for 32/64-bit bundle downloads
Scott Main [Thu, 15 Nov 2012 23:21:00 +0000 (15:21 -0800)]
am
11ac05bb: docs: add script for 32/64-bit bundle downloads
* commit '
11ac05bb015c4097f828b0907a0835f7d546738c':
docs: add script for 32/64-bit bundle downloads
Ying Wang [Thu, 15 Nov 2012 23:20:58 +0000 (15:20 -0800)]
am
ce811261: Merge "Move check-api to definition.mk" into jb-mr1.1-dev
* commit '
ce811261bc8d56d43e59b1f9fb96ae53192de126':
Move check-api to definition.mk