OSDN Git Service
Doug Zongker [Thu, 20 Sep 2012 13:08:12 +0000 (06:08 -0700)]
am
147626e6: change SignApk.java to use bouncy castle for signing
* commit '
147626e624ec0b709e6dc8f156ccb391fffef9c8':
change SignApk.java to use bouncy castle for signing
Doug Zongker [Tue, 4 Sep 2012 20:32:13 +0000 (13:32 -0700)]
change SignApk.java to use bouncy castle for signing
Remove use of the private sun.security.* classes for generating pkcs7
signatures and use bouncy castle instead.
Change-Id: Ie8213575461975085d119e000e764d2a28c26715
Scott Main [Tue, 18 Sep 2012 23:54:37 +0000 (16:54 -0700)]
am
8cf60ec1: am
5acbfcf6: am
7039b4a7: create consistent spacing between lists and the paragraphs within them
* commit '
8cf60ec166e32472801d203384f9de2e62004da1':
create consistent spacing between lists and the paragraphs within them
Scott Main [Tue, 18 Sep 2012 22:54:12 +0000 (15:54 -0700)]
am
5acbfcf6: am
7039b4a7: create consistent spacing between lists and the paragraphs within them
* commit '
5acbfcf66aa60908213522a6b69b41f4b69f6f8e':
create consistent spacing between lists and the paragraphs within them
Scott Main [Tue, 18 Sep 2012 22:40:02 +0000 (15:40 -0700)]
am
7039b4a7: create consistent spacing between lists and the paragraphs within them
* commit '
7039b4a7bca269a898aacad9ddde693598ccecfc':
create consistent spacing between lists and the paragraphs within them
Scott Main [Tue, 18 Sep 2012 18:27:59 +0000 (11:27 -0700)]
create consistent spacing between lists and the paragraphs within them
Change-Id: I792cca40a4cca6f811d1528219e51b3895d4d626
Daniel Sandler [Tue, 18 Sep 2012 17:42:37 +0000 (10:42 -0700)]
am
ed9a2106: Merge "Remove WebViewDream from the build." into jb-mr1-dev
* commit '
ed9a2106a1e8fa7cb2f30d571d90b8a0b3e123a5':
Remove WebViewDream from the build.
Daniel Sandler [Tue, 18 Sep 2012 17:35:24 +0000 (10:35 -0700)]
Merge "Remove WebViewDream from the build." into jb-mr1-dev
The Android Open Source Project [Sat, 15 Sep 2012 23:16:37 +0000 (16:16 -0700)]
am
50ba3615: am
fd14e242: (-s ours) Reconcile with jb-nakasig-release - do not merge
* commit '
50ba3615a4f8702b8d779dbaba90363e39f0a1be':
JGO77
JGO76
The Android Open Source Project [Sat, 15 Sep 2012 23:09:34 +0000 (16:09 -0700)]
am
fd14e242: (-s ours) Reconcile with jb-nakasig-release - do not merge
* commit '
fd14e2425fc0d1efa1295d1dbf6b0d1b058730b4':
JGO77
JGO76
The Android Open Source Project [Sat, 15 Sep 2012 15:21:27 +0000 (08:21 -0700)]
Reconcile with jb-nakasig-release - do not merge
Change-Id: I48d8019902c8848541677a7ddc1aa63edf74b23c
The Android Automerger [Sat, 15 Sep 2012 15:09:11 +0000 (08:09 -0700)]
JGO77
The Android Automerger [Sat, 15 Sep 2012 15:09:03 +0000 (08:09 -0700)]
merge in jb-nakasig-release history after reset to jb-dev
The Android Automerger [Fri, 14 Sep 2012 15:09:16 +0000 (08:09 -0700)]
JGO76
The Android Automerger [Fri, 14 Sep 2012 15:09:01 +0000 (08:09 -0700)]
merge in jb-nakasig-release history after reset to jb-dev
Jean-Baptiste Queru [Fri, 14 Sep 2012 14:52:20 +0000 (07:52 -0700)]
am
b0cba16a: am
7916e624: (-s ours) am
a0689075: Update version number for AOSP master
* commit '
b0cba16a6d2d901682ee44f99d7196fcf6888357':
Update version number for AOSP master
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
Daniel Sandler [Thu, 13 Sep 2012 20:06:43 +0000 (13:06 -0700)]
Remove WebViewDream from the build.
It will remain in AOSP as sample code.
Change-Id: I253034f45d7008beadf9220f6e13a76c3ead3490
The Android Open Source Project [Thu, 13 Sep 2012 18:28:43 +0000 (11:28 -0700)]
am
e4f72f82: am
fc9e3924: (-s ours) Reconcile with jb-nakasig-release - do not merge
* commit '
e4f72f8207b40e7b0b4e8b0d33514729ca016039':
JGO75
JGO74
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
Andrew Hsieh [Wed, 12 Sep 2012 22:43:21 +0000 (15:43 -0700)]
am
5630521a: resolved conflicts for merge of
3e91f5ad to jb-mr1-dev
* commit '
5630521aba12a03637e7328686924df4d298ff4d':
Enable stack-protector for x86
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:52:16 +0000 (14:52 -0700)]
am
063d0c5d: Merge "Add openssl to TINY_ANDROID build" into jb-mr1-dev
* commit '
063d0c5deefc1cda1027a9241dbaf338cac35be0':
Add openssl to TINY_ANDROID build
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"
Scott Main [Wed, 12 Sep 2012 17:38:20 +0000 (10:38 -0700)]
am
7d89e1ce: am
7832dda0: am
5b5ff1a6: more specific selector for new blockquote style to fix regressions on other pages that use <blockquote>
* commit '
7d89e1ce07c2c443dfb5ba576788c0d99c4dd4e2':
more specific selector for new blockquote style to fix regressions on other pages that use <blockquote>
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:52:26 +0000 (07:52 -0700)]
am
f5cc87ba: am
60573fd6: (-s ours) Reconcile with jb-nakasig-release jb-mr0-release - do not merge
* commit '
f5cc87bae46e9aa3ebdca60f047b2bfe15132f54':
JZO54G
JGO73
JZO54F
JGO72
JGO71
JGO70
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 Open Source Project [Wed, 12 Sep 2012 14:39:40 +0000 (07:39 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I52d5c4eeb3109ef463a8775b43c2004c0f2e7c4a
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:46:04 +0000 (14:46 -0700)]
am
b050ed29: am
5f4e1ac6: am
ee7cb463: Merge "add \'small\' style for long headings in Training courses" into jb-dev
* commit '
b050ed294a8e8339925fcc5fe1def7d9cb68fe1d':
add 'small' style for long headings in Training courses
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:18:18 +0000 (12:18 -0700)]
am
aadbb3d3: am
930d2b5c: am
6a6723a0: am
4458452e: Merge "android.core.vm-tests-tf.jar path changed to HOST JAVA_LIBRARIES."
* commit '
aadbb3d3b2a41db5c6b4b85ae31577b706ffa3b1':
android.core.vm-tests-tf.jar path changed to HOST JAVA_LIBRARIES.
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:27:06 +0000 (10:27 -0700)]
am
55861069: am
4595d7d6: am
410420ed: am
9efa5bae: Merge "Add transform-d-to-p-args"
* commit '
558610694400a8245dd2cfea5790af5e642d8465':
Add transform-d-to-p-args
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:21:18 +0000 (16:21 -0700)]
am
243b0dc1: am
65cdbdcd: am
65511c0a: fix script bug. we were running some scripts that are only used in the reference
* commit '
243b0dc1368b44fe90c26d993abc3df41042d2e9':
fix script bug. we were running some scripts that are only used in the reference
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:24:10 +0000 (15:24 -0700)]
am
b2c31c3e: am
a7b0ec3c: (-s ours) Reconcile with jb-nakasig-release jb-mr0-release jb-release - do not merge
* commit '
b2c31c3ec814479bde1d0f7ed633653a8045a081':
JRO03W
JRO69
JGO69
JGO68
JGO67
JZO54E
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 Open Source Project [Fri, 7 Sep 2012 22:03:38 +0000 (15:03 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I539f46011cbad0084b0fbb9dba6bb553ee370851
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
OSDN Git Service
