OSDN Git Service
The Android Automerger [Fri, 14 Sep 2012 21:11:28 +0000 (14:11 -0700)]
JOO76C
The Android Automerger [Fri, 14 Sep 2012 21:10:09 +0000 (14:10 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Fri, 14 Sep 2012 16:43:38 +0000 (09:43 -0700)]
JOO76B
Jean-Baptiste Queru [Fri, 14 Sep 2012 14:50:25 +0000 (07:50 -0700)]
am
7916e624: (-s ours) am
a0689075: Update version number for AOSP master
* commit '
7916e624bd0f084b945ec39dd258057ed8e5dd6f':
Update version number for AOSP master
Jean-Baptiste Queru [Fri, 14 Sep 2012 14:45:44 +0000 (07:45 -0700)]
am
a0689075: Update version number for AOSP master
* commit '
a06890757028f7f8ae77a2c7616885a800aee15f':
Update version number for AOSP master
Jean-Baptiste Queru [Fri, 14 Sep 2012 14:43:41 +0000 (07:43 -0700)]
Update version number for AOSP master
Change-Id: I5bc11420932d62a2f6bc12410fe7c8ac2dca069b
The Android Automerger [Fri, 14 Sep 2012 14:14:02 +0000 (07:14 -0700)]
JOO76
The Android Automerger [Fri, 14 Sep 2012 14:11:00 +0000 (07:11 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Thu, 13 Sep 2012 22:43:28 +0000 (15:43 -0700)]
JOO75B
The Android Open Source Project [Thu, 13 Sep 2012 18:27:46 +0000 (11:27 -0700)]
am
fc9e3924: (-s ours) Reconcile with jb-nakasig-release - do not merge
* commit '
fc9e3924a2b9daa55818d7f0b1d819bf171535f5':
JGO75
JGO74
The Android Open Source Project [Thu, 13 Sep 2012 18:25:29 +0000 (11:25 -0700)]
Reconcile with jb-nakasig-release - do not merge
Change-Id: Ic4af6ed24af4503222b6b31e87a2e45fc07cb47e
The Android Automerger [Thu, 13 Sep 2012 15:09:21 +0000 (08:09 -0700)]
JGO75
The Android Automerger [Thu, 13 Sep 2012 15:09:05 +0000 (08:09 -0700)]
merge in jb-nakasig-release history after reset to jb-dev
The Android Automerger [Thu, 13 Sep 2012 14:01:36 +0000 (07:01 -0700)]
JOO75
The Android Automerger [Thu, 13 Sep 2012 13:59:19 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Thu, 13 Sep 2012 02:10:24 +0000 (19:10 -0700)]
JOO74D
The Android Automerger [Thu, 13 Sep 2012 00:31:38 +0000 (17:31 -0700)]
JOO74C
Andrew Hsieh [Wed, 12 Sep 2012 22:27:59 +0000 (15:27 -0700)]
resolved conflicts for merge of
3e91f5ad to jb-mr1-dev
Change-Id: I9b587bc6086e1edacc98879e43668001bf72f7db
Benoit Goby [Wed, 12 Sep 2012 21:50:54 +0000 (14:50 -0700)]
Merge "Add openssl to TINY_ANDROID build" into jb-mr1-dev
Andrew Hsieh [Wed, 12 Sep 2012 21:21:07 +0000 (14:21 -0700)]
am
0f47a94d: am
7e300d60: Merge "Enable stack-protector for x86"
* commit '
0f47a94d2eb50f30b7f559c7c7fc2a8632412cc8':
Enable stack-protector for x86
Andrew Hsieh [Wed, 12 Sep 2012 21:20:11 +0000 (14:20 -0700)]
am
7e300d60: Merge "Enable stack-protector for x86"
* commit '
7e300d60bfc325e3cbf3e7656297c14109e513b8':
Enable stack-protector for x86
Andrew Hsieh [Wed, 12 Sep 2012 20:44:00 +0000 (13:44 -0700)]
Merge "Enable stack-protector for x86"
The Android Automerger [Wed, 12 Sep 2012 17:37:41 +0000 (10:37 -0700)]
JOO74B
Scott Main [Wed, 12 Sep 2012 17:36:15 +0000 (10:36 -0700)]
am
7832dda0: am
5b5ff1a6: more specific selector for new blockquote style to fix regressions on other pages that use <blockquote>
* commit '
7832dda030013a10cf2c161d37025bed5433326e':
more specific selector for new blockquote style to fix regressions on other pages that use <blockquote>
Scott Main [Wed, 12 Sep 2012 17:34:15 +0000 (10:34 -0700)]
am
5b5ff1a6: more specific selector for new blockquote style to fix regressions on other pages that use <blockquote>
* commit '
5b5ff1a6aeb0d12ecdf817d6ec3e585fd2c892e3':
more specific selector for new blockquote style to fix regressions on other pages that use <blockquote>
Scott Main [Wed, 12 Sep 2012 17:29:45 +0000 (10:29 -0700)]
more specific selector for new blockquote style to fix regressions
on other pages that use <blockquote>
Change-Id: Icf37f515cfe2204afb58a796222c166088d0f131
The Android Automerger [Wed, 12 Sep 2012 15:09:20 +0000 (08:09 -0700)]
JGO74
The Android Automerger [Wed, 12 Sep 2012 15:09:04 +0000 (08:09 -0700)]
merge in jb-nakasig-release history after reset to jb-dev
The Android Open Source Project [Wed, 12 Sep 2012 14:50:14 +0000 (07:50 -0700)]
am
60573fd6: (-s ours) Reconcile with jb-nakasig-release jb-mr0-release - do not merge
* commit '
60573fd6083162f6a6adaa73e6978c93b76c0cb3':
JZO54G
JGO73
JZO54F
JGO72
JGO71
JGO70
The Android Open Source Project [Wed, 12 Sep 2012 14:49:09 +0000 (07:49 -0700)]
Reconcile with jb-nakasig-release jb-mr0-release - do not merge
Change-Id: Ieff44ac588f6e8b8dd4ec52f28b94d38fbf985ca
The Android Automerger [Wed, 12 Sep 2012 14:01:19 +0000 (07:01 -0700)]
JOO74
The Android Automerger [Wed, 12 Sep 2012 13:59:19 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Wed, 12 Sep 2012 05:18:30 +0000 (22:18 -0700)]
JZO54G
Benoit Goby [Sat, 1 Sep 2012 02:51:20 +0000 (19:51 -0700)]
Add openssl to TINY_ANDROID build
adb depends on it
Change-Id: I79f23315142b45bc7f9a2685fa2b9865b22396ad
The Android Automerger [Tue, 11 Sep 2012 23:16:50 +0000 (16:16 -0700)]
JOO73D
Scott Main [Tue, 11 Sep 2012 21:44:07 +0000 (14:44 -0700)]
am
5f4e1ac6: am
ee7cb463: Merge "add \'small\' style for long headings in Training courses" into jb-dev
* commit '
5f4e1ac6ee30784e458df3d90c0950595ad810a6':
add 'small' style for long headings in Training courses
Scott Main [Tue, 11 Sep 2012 21:42:43 +0000 (14:42 -0700)]
am
ee7cb463: Merge "add \'small\' style for long headings in Training courses" into jb-dev
* commit '
ee7cb4637dd257e0f9610ed87d14ab10d07bd106':
add 'small' style for long headings in Training courses
Scott Main [Tue, 11 Sep 2012 21:41:28 +0000 (14:41 -0700)]
Merge "add 'small' style for long headings in Training courses" into jb-dev
Scott Main [Tue, 11 Sep 2012 21:27:34 +0000 (14:27 -0700)]
add 'small' style for long headings in Training courses
Change-Id: I385df22d12ad419ad6883c0e94d3053e7e520a09
Ying Wang [Tue, 11 Sep 2012 19:16:46 +0000 (12:16 -0700)]
am
930d2b5c: am
6a6723a0: am
4458452e: Merge "android.core.vm-tests-tf.jar path changed to HOST JAVA_LIBRARIES."
* commit '
930d2b5c3ff8727fc94609b7f9c40ef8e10a30d0':
android.core.vm-tests-tf.jar path changed to HOST JAVA_LIBRARIES.
Ying Wang [Tue, 11 Sep 2012 19:14:34 +0000 (12:14 -0700)]
am
6a6723a0: am
4458452e: Merge "android.core.vm-tests-tf.jar path changed to HOST JAVA_LIBRARIES."
* commit '
6a6723a0a9c2b3c1756ce8cdf1910ade264c26ef':
android.core.vm-tests-tf.jar path changed to HOST JAVA_LIBRARIES.
Ying Wang [Tue, 11 Sep 2012 19:12:23 +0000 (12:12 -0700)]
am
4458452e: Merge "android.core.vm-tests-tf.jar path changed to HOST JAVA_LIBRARIES."
* commit '
4458452ef64f271906914e79ffd9923630ae22f2':
android.core.vm-tests-tf.jar path changed to HOST JAVA_LIBRARIES.
Ying Wang [Tue, 11 Sep 2012 18:49:11 +0000 (11:49 -0700)]
Merge "android.core.vm-tests-tf.jar path changed to HOST JAVA_LIBRARIES."
Ying Wang [Tue, 21 Aug 2012 18:54:49 +0000 (11:54 -0700)]
android.core.vm-tests-tf.jar path changed to HOST JAVA_LIBRARIES.
Bug:
7019588
Change-Id: I6406110071d891e27df6d1cc562a7baa884b2e9e
The Android Automerger [Tue, 11 Sep 2012 18:29:46 +0000 (11:29 -0700)]
JOO73C
The Android Automerger [Tue, 11 Sep 2012 16:54:42 +0000 (09:54 -0700)]
JGO73
The Android Automerger [Tue, 11 Sep 2012 16:54:29 +0000 (09:54 -0700)]
merge in jb-nakasig-release history after reset to jb-dev
The Android Automerger [Tue, 11 Sep 2012 14:38:49 +0000 (07:38 -0700)]
JOO73B
The Android Automerger [Tue, 11 Sep 2012 14:01:00 +0000 (07:01 -0700)]
JOO73
The Android Automerger [Tue, 11 Sep 2012 13:59:15 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Tue, 11 Sep 2012 00:37:32 +0000 (17:37 -0700)]
JOO72C
The Android Automerger [Mon, 10 Sep 2012 22:11:04 +0000 (15:11 -0700)]
JZO54F
The Android Automerger [Mon, 10 Sep 2012 22:02:40 +0000 (15:02 -0700)]
JOO72B
Ying Wang [Mon, 10 Sep 2012 17:25:41 +0000 (10:25 -0700)]
am
4595d7d6: am
410420ed: am
9efa5bae: Merge "Add transform-d-to-p-args"
* commit '
4595d7d62c0d594aa3501e4f547563348a3a5eb0':
Add transform-d-to-p-args
Ying Wang [Mon, 10 Sep 2012 17:23:29 +0000 (10:23 -0700)]
am
410420ed: am
9efa5bae: Merge "Add transform-d-to-p-args"
* commit '
410420ed667f869e15df0d3204834282984d4f6a':
Add transform-d-to-p-args
Ying Wang [Mon, 10 Sep 2012 17:21:57 +0000 (10:21 -0700)]
am
9efa5bae: Merge "Add transform-d-to-p-args"
* commit '
9efa5bae8645988a0d24af14142df9572bf7bd57':
Add transform-d-to-p-args
Ying Wang [Mon, 10 Sep 2012 16:48:26 +0000 (09:48 -0700)]
Merge "Add transform-d-to-p-args"
The Android Automerger [Mon, 10 Sep 2012 15:09:13 +0000 (08:09 -0700)]
JGO72
The Android Automerger [Mon, 10 Sep 2012 15:09:11 +0000 (08:09 -0700)]
merge in jb-nakasig-release history after reset to jb-dev
The Android Automerger [Mon, 10 Sep 2012 14:00:36 +0000 (07:00 -0700)]
JOO72
The Android Automerger [Mon, 10 Sep 2012 13:59:08 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Sun, 9 Sep 2012 22:02:11 +0000 (15:02 -0700)]
JOO71B
The Android Automerger [Sun, 9 Sep 2012 15:09:10 +0000 (08:09 -0700)]
JGO71
The Android Automerger [Sun, 9 Sep 2012 15:09:06 +0000 (08:09 -0700)]
merge in jb-nakasig-release history after reset to jb-dev
The Android Automerger [Sun, 9 Sep 2012 14:03:09 +0000 (07:03 -0700)]
JOO71
The Android Automerger [Sun, 9 Sep 2012 13:59:39 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Sat, 8 Sep 2012 18:59:21 +0000 (11:59 -0700)]
JOO68E
The Android Automerger [Sat, 8 Sep 2012 15:09:14 +0000 (08:09 -0700)]
JGO70
The Android Automerger [Sat, 8 Sep 2012 15:09:05 +0000 (08:09 -0700)]
merge in jb-nakasig-release history after reset to jb-dev
Ying Wang [Sat, 8 Sep 2012 00:04:06 +0000 (17:04 -0700)]
Add transform-d-to-p-args
This new indirection allows us too to output .P files when we are
generating non-.o files, such as .s or .S files.
Bug:
7127743
Change-Id: I9e46c417031764fefc9909ba4a3eb63885f34f9e
Scott Main [Fri, 7 Sep 2012 23:19:11 +0000 (16:19 -0700)]
am
65cdbdcd: am
65511c0a: fix script bug. we were running some scripts that are only used in the reference
* commit '
65cdbdcdf09f8884141b2478e1eb4d48397880d9':
fix script bug. we were running some scripts that are only used in the reference
Scott Main [Fri, 7 Sep 2012 23:17:11 +0000 (16:17 -0700)]
am
65511c0a: fix script bug. we were running some scripts that are only used in the reference
* commit '
65511c0a726751e9973486198086d8db6a141455':
fix script bug. we were running some scripts that are only used in the reference
The Android Automerger [Fri, 7 Sep 2012 23:14:45 +0000 (16:14 -0700)]
JOO68D
Scott Main [Fri, 7 Sep 2012 22:51:32 +0000 (15:51 -0700)]
fix script bug. we were running some scripts that are only used in the reference
Change-Id: I0693a7a7af5e41283942b387e53a254903b83427
The Android Open Source Project [Fri, 7 Sep 2012 22:22:29 +0000 (15:22 -0700)]
am
a7b0ec3c: (-s ours) Reconcile with jb-nakasig-release jb-mr0-release jb-release - do not merge
* commit '
a7b0ec3c4892ae20a0726debc3f3642dbada7bc7':
JRO03W
JRO69
JGO69
JGO68
JGO67
JZO54E
The Android Open Source Project [Fri, 7 Sep 2012 22:20:57 +0000 (15:20 -0700)]
Reconcile with jb-nakasig-release jb-mr0-release jb-release - do not merge
Change-Id: Ibb66fb1e9c4c3066c8a27139922300a511ff9e7b
The Android Automerger [Fri, 7 Sep 2012 17:29:09 +0000 (10:29 -0700)]
JRO03W
The Android Automerger [Fri, 7 Sep 2012 17:28:17 +0000 (10:28 -0700)]
JRO69
The Android Automerger [Fri, 7 Sep 2012 17:28:12 +0000 (10:28 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Fri, 7 Sep 2012 15:09:06 +0000 (08:09 -0700)]
JGO69
The Android Automerger [Fri, 7 Sep 2012 15:09:00 +0000 (08:09 -0700)]
merge in jb-nakasig-release history after reset to jb-dev
The Android Automerger [Thu, 6 Sep 2012 23:09:10 +0000 (16:09 -0700)]
JOO68C
The Android Automerger [Thu, 6 Sep 2012 22:09:18 +0000 (15:09 -0700)]
JGO68
The Android Automerger [Thu, 6 Sep 2012 22:09:17 +0000 (15:09 -0700)]
merge in jb-nakasig-release history after reset to jb-dev
The Android Automerger [Thu, 6 Sep 2012 22:08:50 +0000 (15:08 -0700)]
JGO67
The Android Automerger [Thu, 6 Sep 2012 21:29:42 +0000 (14:29 -0700)]
JOO68B
The Android Automerger [Thu, 6 Sep 2012 20:30:11 +0000 (13:30 -0700)]
JZO54E
Ying Wang [Thu, 6 Sep 2012 17:44:12 +0000 (10:44 -0700)]
am
b4199b86: am
1c27ac0e: am
1b70bb21: Merge "Clean step for libc."
* commit '
b4199b869bcc3b8dff6572c682fe09f74660268e':
Clean step for libc.
Ying Wang [Thu, 6 Sep 2012 17:43:07 +0000 (10:43 -0700)]
am
1c27ac0e: am
1b70bb21: Merge "Clean step for libc."
* commit '
1c27ac0ea9d2e43d8ff05c61aa4fe6f3d9558334':
Clean step for libc.
Ying Wang [Thu, 6 Sep 2012 17:40:43 +0000 (10:40 -0700)]
am
1b70bb21: Merge "Clean step for libc."
* commit '
1b70bb2162d74a304bd0d00674a0fed80f936961':
Clean step for libc.
Ying Wang [Thu, 6 Sep 2012 17:36:30 +0000 (10:36 -0700)]
Merge "Clean step for libc."
Ying Wang [Wed, 5 Sep 2012 22:58:29 +0000 (15:58 -0700)]
Clean step for libc.
(cherry-pick of
ab1e93d4d4f4a46fa922df5ba7ccd41dde1221ac.)
Change-Id: I304312d6eb0346c050d02bd834565e0d43d8b4dd
Ying Wang [Thu, 6 Sep 2012 17:29:49 +0000 (10:29 -0700)]
Clean up the crt*.o files.
To fix incremental build failure caused by
https://android-review.googlesource.com/41940
Change-Id: I9a977fe6e26fefaababdbb5d498b63e37884a4be
The Android Open Source Project [Thu, 6 Sep 2012 16:11:29 +0000 (09:11 -0700)]
am
11f26123: (-s ours) Reconcile with jb-mr0-release jb-release - do not merge
* commit '
11f2612325a38dadb78d9d23146b57fa3330d00c':
JZO54D
JZO54C
Add make_ext4fs to all builds
JZO54B
JRO03V
JRO03V
The Android Open Source Project [Thu, 6 Sep 2012 15:08:09 +0000 (08:08 -0700)]
Reconcile with jb-mr0-release jb-release - do not merge
Change-Id: I788e28f1f2a2d2a41c5c49097da31417b476cfcb
The Android Automerger [Thu, 6 Sep 2012 13:35:55 +0000 (06:35 -0700)]
JOO68
The Android Automerger [Thu, 6 Sep 2012 13:33:27 +0000 (06:33 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Ying Wang [Thu, 6 Sep 2012 01:39:55 +0000 (18:39 -0700)]
am
19c06156: am
0ee362ea: am
478d0fc6: Merge "Remove duplicate src:dest pairs in PRODUCT_COPY_FILES"
* commit '
19c06156b6615ba53d81d2ecdc341c3feea21662':
Remove duplicate src:dest pairs in PRODUCT_COPY_FILES
Ying Wang [Thu, 6 Sep 2012 01:37:46 +0000 (18:37 -0700)]
am
0ee362ea: am
478d0fc6: Merge "Remove duplicate src:dest pairs in PRODUCT_COPY_FILES"
* commit '
0ee362ea0485f6885c81fa1a6cb9868ae304f3e3':
Remove duplicate src:dest pairs in PRODUCT_COPY_FILES
Ying Wang [Thu, 6 Sep 2012 01:35:50 +0000 (18:35 -0700)]
am
478d0fc6: Merge "Remove duplicate src:dest pairs in PRODUCT_COPY_FILES"
* commit '
478d0fc6a311b236fddc9d18c9a1b922f8ecf1ea':
Remove duplicate src:dest pairs in PRODUCT_COPY_FILES
OSDN Git Service
