OSDN Git Service
The Android Open Source Project [Fri, 21 Dec 2012 22:10:50 +0000 (14:10 -0800)]
Reconcile with jb-mr1.1-release - do not merge
Change-Id: Iff920fa574533c1c22a8c1408291f43e81ab7a2f
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 Open Source Project [Fri, 21 Dec 2012 15:59:28 +0000 (07:59 -0800)]
Reconcile with jb-mr1.1-release - do not merge
Change-Id: Ic86ea3815748a11695d10b369d957ebdf647ab57
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 Open Source Project [Thu, 20 Dec 2012 23:46:18 +0000 (15:46 -0800)]
Reconcile with jb-mr1.1-release - do not merge
Change-Id: I522981a273e1844811c7a53ca76c75a3e3365b77
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:31:12 +0000 (19:31 -0800)]
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.
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
The Android Open Source Project [Wed, 19 Dec 2012 22:33:27 +0000 (14:33 -0800)]
Reconcile with jb-mr1.1-release - do not merge
Change-Id: I6f627ab7e473280d29846f3523d8cfe9b648df7d
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 Open Source Project [Wed, 19 Dec 2012 21:58:48 +0000 (13:58 -0800)]
Reconcile with jb-mr1.1-release - do not merge
Change-Id: I4df1ba6a619529d9f5b96e8b7ed8bc470a81e2ad
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
The Android Open Source Project [Wed, 19 Dec 2012 16:36:52 +0000 (08:36 -0800)]
Reconcile with jb-mr1.1-release - do not merge
Change-Id: I8c005f84138fa3c89e006790fcf107e521dfa20e
Ying Wang [Wed, 19 Dec 2012 07:09:09 +0000 (23:09 -0800)]
am
ead4b642: am
5f97f2b6: am
6a6c1121: Run e2fsck on built sparse images.
* commit '
ead4b642cffe258e08326628af2c83c99c14df1f':
Run e2fsck on built sparse images.
Chad Jones [Wed, 19 Dec 2012 03:40:22 +0000 (19:40 -0800)]
Bump version to JDP79B
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 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 Open Source Project [Tue, 18 Dec 2012 17:44:14 +0000 (09:44 -0800)]
Reconcile with jb-mr1.1-release - do not merge
Change-Id: Ic8d9ce1145f5905986ee9b567f020a8cc7a58058
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 Open Source Project [Fri, 14 Dec 2012 22:03:11 +0000 (14:03 -0800)]
Reconcile with jb-mr1.1-release - do not merge
Change-Id: I9499ee080c842e363f7aa78057f714dd3e32d43d
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
Ying Wang [Thu, 13 Dec 2012 23:51:30 +0000 (15:51 -0800)]
am
9eedd3ab: Merge "Use "\cd" to disable alias temporarily."
* commit '
9eedd3abed1d38ac5639a1f47ee80a7dbd0fb207':
Use "\cd" to disable alias temporarily.
Ben Cheng [Thu, 13 Dec 2012 23:51:29 +0000 (15:51 -0800)]
am
5ece4724: Merge "Enable lunch command to pick up new toolchain version."
* commit '
5ece4724d19712225d4fbb6d91d86619015d81b3':
Enable lunch command to pick up new toolchain version.
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
Ying Wang [Thu, 13 Dec 2012 19:08:37 +0000 (11:08 -0800)]
Merge "Use "\cd" to disable alias temporarily."
Ying Wang [Thu, 13 Dec 2012 18:52:07 +0000 (10:52 -0800)]
Use "\cd" to disable alias temporarily.
http://code.google.com/p/android/issues/detail?id=41372
Change-Id: I78e468cb5d57e51774d2e42376ef1f4b52096d33
Ben Cheng [Thu, 13 Dec 2012 00:22:54 +0000 (16:22 -0800)]
Enable lunch command to pick up new toolchain version.
Otherwise the previously exported value will be sticky and the value
defined in the TARGET makefile is ignored.
Change-Id: Icdacb8c46034b8a24a9875b7596b31d00861512a
Ben Cheng [Thu, 13 Dec 2012 18:11:21 +0000 (10:11 -0800)]
Merge "Enable lunch command to pick up new toolchain version."
Ben Cheng [Thu, 13 Dec 2012 00:22:54 +0000 (16:22 -0800)]
Enable lunch command to pick up new toolchain version.
Otherwise the previously exported value will be sticky and the value
defined in the TARGET makefile is ignored.
Change-Id: I13b9cca2d288f7ab09104c57e7cad9f23de2548a
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
Ben Cheng [Wed, 12 Dec 2012 17:55:55 +0000 (09:55 -0800)]
am
98ce73b2: (-s ours) Merge "Refresh ARM toolchain to GCC 4.7 / binutils 2.22."
* commit '
98ce73b27a9df7795cc91ea9ca5781d3255828c7':
Refresh ARM toolchain to GCC 4.7 / binutils 2.22.
Ben Cheng [Wed, 12 Dec 2012 17:33:13 +0000 (09:33 -0800)]
Merge "Refresh ARM toolchain to GCC 4.7 / binutils 2.22."
The Android Open Source Project [Wed, 12 Dec 2012 15:43:43 +0000 (07:43 -0800)]
am
b3e8a615: am
16cb8655: Reconcile with jb-mr1-release - do not merge
* commit '
b3e8a615d0fdb18bd4d3ac76e72b3fceab590f17':
JOP40F
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
The Android Open Source Project [Wed, 12 Dec 2012 15:33:50 +0000 (07:33 -0800)]
Reconcile with jb-mr1.1-release - do not merge
Change-Id: Idb85365d68dc7637fb2efd3213eacb49c0e26785
The Android Automerger [Wed, 12 Dec 2012 07:59:23 +0000 (23:59 -0800)]
JDP72B
Ben Cheng [Wed, 12 Dec 2012 00:51:13 +0000 (16:51 -0800)]
am
62f1d86e: Merge "Define TARGET_GCC_VERSION in target specific make files."
* commit '
62f1d86e4850bdc4f470cf1f0c2428f5b427a347':
Define TARGET_GCC_VERSION in target specific make files.
Ben Cheng [Wed, 12 Dec 2012 00:32:34 +0000 (16:32 -0800)]
Refresh ARM toolchain to GCC 4.7 / binutils 2.22.
Change-Id: Id3689376ae4c4fc183569955b2ee98df5c069510
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
Ben Cheng [Tue, 11 Dec 2012 23:52:02 +0000 (15:52 -0800)]
Merge "Define TARGET_GCC_VERSION in target specific make files."
Ying Wang [Tue, 27 Nov 2012 02:10:23 +0000 (18:10 -0800)]
Run e2fsck on built sparse images.
Bug:
7591683
Change-Id: Id1cba79f7840aab1f0327cb741eda655b45d1b46
Ben Cheng [Tue, 11 Dec 2012 22:01:10 +0000 (14:01 -0800)]
Define TARGET_GCC_VERSION in target specific make files.
So that GCC refresh can be performed in a target specific way.
Change-Id: I867e8b8fd671bef8c5af300e657a6da4fface032
The Android Automerger [Tue, 11 Dec 2012 21:59:16 +0000 (13:59 -0800)]
JOP40F
The Android Open Source Project [Tue, 11 Dec 2012 19:53:49 +0000 (11:53 -0800)]
Reconcile with jb-mr1.1-release - do not merge
Change-Id: Idcf1a5e4acf53a40deeb6304d83a734722c7aff4
Nick Kralevich [Tue, 11 Dec 2012 18:33:14 +0000 (10:33 -0800)]
am
a303510f: Merge "x86: enable FORTIFY_SOURCE"
* commit '
a303510f133e0e20aefedd7d03adfbb88cb85a54':
x86: enable FORTIFY_SOURCE
Nick Kralevich [Tue, 11 Dec 2012 16:41:35 +0000 (08:41 -0800)]
Merge "x86: enable FORTIFY_SOURCE"
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
Ben Cheng [Tue, 11 Dec 2012 01:02:27 +0000 (17:02 -0800)]
am
a7b85086: Merge "Export TARGET_GCC_VERSION as an env variable."
* commit '
a7b850864c54bb6f223d4b186c5937fd20aa68d8':
Export TARGET_GCC_VERSION as an env variable.
Ben Cheng [Tue, 11 Dec 2012 00:37:33 +0000 (16:37 -0800)]
Merge "Export TARGET_GCC_VERSION as an env variable."
Ben Cheng [Tue, 11 Dec 2012 00:04:39 +0000 (16:04 -0800)]
Export TARGET_GCC_VERSION as an env variable.
Have it referenced by the adbs tool to pick the specified toolchain.
Change-Id: I23df88946254a55d0749d6753e54559faf33e121
The Android Open Source Project [Mon, 10 Dec 2012 23:19:15 +0000 (15:19 -0800)]
Reconcile with jb-mr1.1-release - do not merge
Change-Id: Icabdf5fba2bdced2fbb6855e237b875f35ea0475
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
Nick Kralevich [Sat, 8 Dec 2012 01:20:28 +0000 (17:20 -0800)]
x86: enable FORTIFY_SOURCE
Enable FORTIFY_SOURCE for Android x86. This adds certain security
protections to Android programs, checking for common programming
mistakes and buffer overflows.
FORTIFY_SOURCE protections have been enabled for ARM since
a46c480e43cc61d0190569684f0a1e53a5da75b6 (Jun 4th 2012)
Change-Id: Idae6f93d37ddae605088867cd3029f12632456e1
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 Open Source Project [Fri, 7 Dec 2012 15:52:39 +0000 (07:52 -0800)]
Reconcile with jb-mr1.1-release - do not merge
Change-Id: If99ecfdce01c838237eaa9ae3e403fcee0a5892c
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 Open Source Project [Thu, 6 Dec 2012 18:46:43 +0000 (10:46 -0800)]
Reconcile with jb-mr1.1-release - do not merge
Change-Id: I487fc4f0fc8050e6f59985a25ad7add411a97a78
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 Open Source Project [Wed, 5 Dec 2012 19:08:38 +0000 (11:08 -0800)]
Reconcile with jb-mr1.1-release - do not merge
Change-Id: I98737a9d0c206077d1faac71b40a14157f575d82
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:59:25 +0000 (17:59 -0800)]
am
abc791fc: am
801a0792: Merge "unbundle photo dreams into the GalleryGoogle package" into jb-mr1.1-dev
* commit '
abc791fc5723bee48763a67a497ae25ac203b65b':
unbundle photo dreams into the GalleryGoogle package
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
Ying Wang [Tue, 4 Dec 2012 00:07:25 +0000 (16:07 -0800)]
am
f8b804f8: Merge "Autoadd core-hostdex if LOCAL_BUILD_HOST_DEX is true"
* commit '
f8b804f8c532c6d913d8389f9a8e4c05a8f0310c':
Autoadd core-hostdex if LOCAL_BUILD_HOST_DEX is true
Ying Wang [Tue, 4 Dec 2012 00:00:26 +0000 (16:00 -0800)]
Merge "Autoadd core-hostdex if LOCAL_BUILD_HOST_DEX is true"
The Android Open Source Project [Mon, 3 Dec 2012 23:58:04 +0000 (15:58 -0800)]
Reconcile with jb-mr1.1-release - do not merge
Change-Id: I1dacc7eb56c438ce9ab211ebdc1b19860bddc0c9
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
Ying Wang [Mon, 3 Dec 2012 23:49:13 +0000 (15:49 -0800)]
Autoadd core-hostdex if LOCAL_BUILD_HOST_DEX is true
Change-Id: Id516716eaa90534f1b51133d5fb97468e52802dd
Jean-Baptiste Queru [Mon, 3 Dec 2012 22:46:37 +0000 (14:46 -0800)]
Merge
d2e4c25e
Change-Id: I7d92c594498f6b4c8277d3a54d54b9724da04408
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:03:41 +0000 (13:03 -0800)]
am
7bfd28d7: am
4bfc9991: am
5c0f9e99: Merge "fix docs.js bug where changeApiLevel is getting called" into jb-mr1-dev
* commit '
7bfd28d74468845b5d2ef0db7753ef1e0075a575':
fix docs.js bug where changeApiLevel is getting called
Robert Ly [Mon, 3 Dec 2012 21:03:40 +0000 (13:03 -0800)]
am
54c59287: am
fd3b957b: am
f88a53d5: Merge "docs: support google css class for reference docs" into jb-mr1-dev
* commit '
54c59287722c354f7a8d326e8d5d144cef715b6e':
docs: support google css class for reference docs
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
OSDN Git Service
