OSDN Git Service
Ying Wang [Mon, 28 Jan 2013 19:36:51 +0000 (11:36 -0800)]
am
cf0a9042: am
9e808ff7: Merge "Use += to append to target-specific PRIVATE_CLEAN_FILES"
# Via Android Git Automerger (1) and others
* commit '
cf0a90426ad969bd2deb66b0c23079842b6c4fa2':
Use += to append to target-specific PRIVATE_CLEAN_FILES
Ying Wang [Mon, 28 Jan 2013 19:34:56 +0000 (11:34 -0800)]
am
9e808ff7: Merge "Use += to append to target-specific PRIVATE_CLEAN_FILES"
# Via Gerrit Code Review (1) and Ying Wang (1)
* commit '
9e808ff70515479458d39abfd64ed11eb55fefbb':
Use += to append to target-specific PRIVATE_CLEAN_FILES
Ying Wang [Mon, 28 Jan 2013 19:05:29 +0000 (19:05 +0000)]
Merge "Use += to append to target-specific PRIVATE_CLEAN_FILES"
Ying Wang [Mon, 28 Jan 2013 18:58:01 +0000 (10:58 -0800)]
Use += to append to target-specific PRIVATE_CLEAN_FILES
Instead of incorrectly including global variable PRIVATE_CLEAN_FILES
Change-Id: I9b5e12448dad5001de051a566d8a94a89b20ecac
Ying Wang [Fri, 18 Jan 2013 02:13:08 +0000 (18:13 -0800)]
am
383ecfaf: DO NOT MERGE: Support LOCAL_EXPORT_C_INCLUDE_DIRS for prebuilts too
* commit '
383ecfaf023dab1fcab25d97548093e32ef1a564':
DO NOT MERGE: Support LOCAL_EXPORT_C_INCLUDE_DIRS for prebuilts too
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:13:27 +0000 (21:13 -0800)]
am
fb959d01: am
474b3f11: am
eb41035f: docs: add the ability to pause the carousel
* commit '
fb959d01d56e2d44e8833a8a9beca5ee5b04a24d':
docs: add the ability to pause the carousel
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:59:29 +0000 (18:59 -0800)]
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
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
Jean-Baptiste Queru [Tue, 8 Jan 2013 16:17:19 +0000 (08:17 -0800)]
am
b81bc684: am
7a184cb7: Merge "Change Email2 reference back to Email"
* commit '
b81bc6842e6743e548a76a1c2f2ac59b4f080b10':
Change Email2 reference back to Email
Jean-Baptiste Queru [Tue, 8 Jan 2013 16:13:50 +0000 (08:13 -0800)]
am
7a184cb7: Merge "Change Email2 reference back to Email"
* commit '
7a184cb70f7fbdf7f9f64b88338dcd155cfe1e3d':
Change Email2 reference back to Email
Jean-Baptiste Queru [Tue, 8 Jan 2013 15:55:50 +0000 (07:55 -0800)]
Merge "Change Email2 reference back to Email"
Roger Chen [Tue, 8 Jan 2013 13:20:32 +0000 (21:20 +0800)]
Change Email2 reference back to Email
Change-Id: Id07d81793d2921be95b30f608cc558312f210c4e
Signed-off-by: Roger Chen <cxr514033970@gmail.com>
Ying Wang [Fri, 4 Jan 2013 23:30:28 +0000 (15:30 -0800)]
am
d01d0bf8: am
58a87c5c: Merge "core/Makefile: Allow specification of file locations"
* commit '
d01d0bf86c2309a7a950549c9c124b303c0c3f82':
core/Makefile: Allow specification of file locations
Ying Wang [Fri, 4 Jan 2013 23:28:20 +0000 (15:28 -0800)]
am
58a87c5c: Merge "core/Makefile: Allow specification of file locations"
* commit '
58a87c5c010e474a1e321d3fe6ce1ad8267576b5':
core/Makefile: Allow specification of file locations
Ying Wang [Fri, 4 Jan 2013 23:01:49 +0000 (15:01 -0800)]
Merge "core/Makefile: Allow specification of file locations"
Ying Wang [Fri, 4 Jan 2013 23:01:18 +0000 (15:01 -0800)]
am
5455455a: am
a6f10400: am
7dc45a8b: Add simg2img and e2fsck to the otatools.
* commit '
5455455a3e550821b381d061803133c82956d7ec':
Add simg2img and e2fsck to the otatools.
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
Andrew Boie [Fri, 28 Sep 2012 16:33:45 +0000 (09:33 -0700)]
core/Makefile: Allow specification of file locations
If multiple build targets use a common recovery.fstab or system.prop,
this allows them to live in a centralized location and not be copied
or symlinked to the device directories.
Change-Id: I7aeb31ed9dc9b43a5e2c9e46fe582b10cba71b24
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
Doug Zongker [Thu, 3 Jan 2013 23:12:43 +0000 (15:12 -0800)]
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.
Doug Zongker [Thu, 3 Jan 2013 22:50:36 +0000 (14:50 -0800)]
Merge "SignApk: perform the whole file signature in a single streaming pass."
Koushik Dutta [Tue, 18 Dec 2012 06:25:22 +0000 (22:25 -0800)]
SignApk: perform the whole file signature in a single streaming pass.
Author: Koushik Dutta <koushd@gmail.com>
Change-Id: I58a68fa4bd4c0c3bb0e025d4311186195fb90e5a
Doug Zongker [Wed, 2 Jan 2013 22:45:12 +0000 (14:45 -0800)]
am
57a5e52d: Merge "add multiple key support to signapk"
* commit '
57a5e52d3692b5f7e4008c8e6aa591aee67de130':
add multiple key support to signapk
Doug Zongker [Wed, 2 Jan 2013 21:49:02 +0000 (13:49 -0800)]
Merge "add multiple key support to signapk"
Doug Zongker [Tue, 16 Oct 2012 00:10:13 +0000 (17:10 -0700)]
add multiple key support to signapk
Support signing .apks (but not OTA packages) with multiple keys.
Bug:
7350459
Change-Id: I794e1da0555e2bb9247a59c756656d4ca7ee04cf
Andrew Hsieh [Fri, 21 Dec 2012 23:51:44 +0000 (15:51 -0800)]
am
26f47aba: Merge "Switch to GCC 4.7 for X86 and MIPS"
* commit '
26f47aba2d973bc1cc459a63df7bd0eec799f4ff':
Switch to GCC 4.7 for X86 and MIPS
Andrew Hsieh [Fri, 21 Dec 2012 23:43:55 +0000 (15:43 -0800)]
Merge "Switch to GCC 4.7 for X86 and MIPS"
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
Andrew Hsieh [Fri, 21 Dec 2012 01:23:05 +0000 (09:23 +0800)]
Switch to GCC 4.7 for X86 and MIPS
Change-Id: I1c2021a15f53e064baf69084894c114289ef7c54
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