OSDN Git Service
The Android Automerger [Thu, 24 Jan 2013 00:29:19 +0000 (16:29 -0800)]
JDQ23
The Android Automerger [Thu, 24 Jan 2013 00:28:43 +0000 (16:28 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
The Android Automerger [Fri, 18 Jan 2013 20:20:38 +0000 (12:20 -0800)]
JDQ18
The Android Automerger [Fri, 18 Jan 2013 20:19:58 +0000 (12:19 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
The Android Automerger [Thu, 17 Jan 2013 00:42:11 +0000 (16:42 -0800)]
JDQ16
The Android Automerger [Thu, 17 Jan 2013 00:41:17 +0000 (16:41 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
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
The Android Automerger [Thu, 10 Jan 2013 19:57:20 +0000 (11:57 -0800)]
JDQ10
The Android Automerger [Thu, 10 Jan 2013 19:56:40 +0000 (11:56 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
The Android Automerger [Wed, 9 Jan 2013 23:48:26 +0000 (15:48 -0800)]
JDQ09
The Android Automerger [Wed, 9 Jan 2013 23:47:20 +0000 (15:47 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
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: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
The Android Automerger [Fri, 21 Dec 2012 21:47:17 +0000 (13:47 -0800)]
JDP82
The Android Automerger [Fri, 21 Dec 2012 21:46:40 +0000 (13:46 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
The Android Automerger [Fri, 21 Dec 2012 00:17:20 +0000 (16:17 -0800)]
JDP81B
The Android Automerger [Fri, 21 Dec 2012 00:17:02 +0000 (16:17 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
The Android Automerger [Thu, 20 Dec 2012 22:31:50 +0000 (14:31 -0800)]
JDP81
The Android Automerger [Thu, 20 Dec 2012 22:31:01 +0000 (14:31 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
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
The Android Automerger [Wed, 19 Dec 2012 22:30:14 +0000 (14:30 -0800)]
JDP80B
The Android Automerger [Wed, 19 Dec 2012 22:29:53 +0000 (14:29 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
The Android Automerger [Wed, 19 Dec 2012 21:51:26 +0000 (13:51 -0800)]
JDP80
The Android Automerger [Wed, 19 Dec 2012 21:50:46 +0000 (13:50 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Chad Jones [Wed, 19 Dec 2012 03:40:22 +0000 (19:40 -0800)]
Bump version to JDP79B
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 Automerger [Tue, 18 Dec 2012 23:19:35 +0000 (15:19 -0800)]
JDP79
The Android Automerger [Tue, 18 Dec 2012 23:19:02 +0000 (15:19 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
The Android Automerger [Tue, 18 Dec 2012 04:50:14 +0000 (20:50 -0800)]
JDP78
The Android Automerger [Tue, 18 Dec 2012 04:49:28 +0000 (20:49 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
The Android Automerger [Fri, 14 Dec 2012 21:56:39 +0000 (13:56 -0800)]
JDP75
The Android Automerger [Fri, 14 Dec 2012 21:56:02 +0000 (13:56 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
The Android Automerger [Thu, 13 Dec 2012 23:31:33 +0000 (15:31 -0800)]
JDP74
The Android Automerger [Thu, 13 Dec 2012 23:30:36 +0000 (15:30 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
The Android Automerger [Wed, 12 Dec 2012 23:06:52 +0000 (15:06 -0800)]
JDP73
The Android Automerger [Wed, 12 Dec 2012 23:06:00 +0000 (15:06 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
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
The Android Automerger [Wed, 12 Dec 2012 07:59:23 +0000 (23:59 -0800)]
JDP72B
The Android Automerger [Tue, 11 Dec 2012 23:57:10 +0000 (15:57 -0800)]
JDP72
The Android Automerger [Tue, 11 Dec 2012 23:56:16 +0000 (15:56 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
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
The Android Automerger [Tue, 11 Dec 2012 03:34:09 +0000 (19:34 -0800)]
JDP71B
The Android Automerger [Tue, 11 Dec 2012 03:33:28 +0000 (19:33 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
The Android Automerger [Mon, 10 Dec 2012 21:06:33 +0000 (13:06 -0800)]
JDP71
The Android Automerger [Mon, 10 Dec 2012 21:05:46 +0000 (13:05 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
The Android Automerger [Fri, 7 Dec 2012 21:26:40 +0000 (13:26 -0800)]
JDP68
The Android Automerger [Fri, 7 Dec 2012 21:26:02 +0000 (13:26 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
The Android Automerger [Fri, 7 Dec 2012 03:36:51 +0000 (19:36 -0800)]
JDP67B
The Android Automerger [Fri, 7 Dec 2012 03:35:57 +0000 (19:35 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
The Android Automerger [Thu, 6 Dec 2012 18:40:18 +0000 (10:40 -0800)]
JDP67
The Android Automerger [Thu, 6 Dec 2012 18:39:05 +0000 (10:39 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
The Android Automerger [Wed, 5 Dec 2012 18:28:18 +0000 (10:28 -0800)]
JDP66
The Android Automerger [Wed, 5 Dec 2012 18:27:36 +0000 (10:27 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
The Android Automerger [Wed, 5 Dec 2012 04:00:08 +0000 (20:00 -0800)]
JDP65
The Android Automerger [Wed, 5 Dec 2012 03:58:36 +0000 (19:58 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
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
The Android Automerger [Mon, 3 Dec 2012 23:54:56 +0000 (15:54 -0800)]
JDP64B
The Android Automerger [Mon, 3 Dec 2012 23:54:17 +0000 (15:54 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
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 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: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
The Android Automerger [Mon, 3 Dec 2012 14:08:05 +0000 (06:08 -0800)]
JDP64
The Android Automerger [Mon, 3 Dec 2012 14:06:24 +0000 (06:06 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
The Android Automerger [Sun, 2 Dec 2012 01:21:58 +0000 (17:21 -0800)]
JDP60E
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
The Android Automerger [Sat, 1 Dec 2012 00:19:57 +0000 (16:19 -0800)]
JDP60D
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
The Android Automerger [Fri, 30 Nov 2012 22:56:25 +0000 (14:56 -0800)]
JDP60C
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
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 Automerger [Thu, 29 Nov 2012 22:01:12 +0000 (14:01 -0800)]
JDP60B
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
OSDN Git Service
