The Android Automerger
c84fa3565f
JOO81B
2012-09-19 14:09:41 -07:00
The Android Automerger
ed43a0172f
JOO81
2012-09-19 07:02:52 -07:00
The Android Automerger
8a6350deeb
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-19 07:01:27 -07:00
Doug Zongker
147626e624
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
2012-09-18 23:29:10 -07:00
The Android Automerger
6e9125bf4f
JOO80C
2012-09-18 16:27:51 -07:00
Scott Main
8cf60ec166
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
2012-09-18 15:54:12 -07:00
Scott Main
5acbfcf66a
am 7039b4a7: create consistent spacing between lists and the paragraphs within them
...
* commit '7039b4a7bca269a898aacad9ddde693598ccecfc':
create consistent spacing between lists and the paragraphs within them
2012-09-18 15:40:02 -07:00
The Android Automerger
c255fa3aff
JOO80B
2012-09-18 14:22:19 -07:00
Scott Main
7039b4a7bc
create consistent spacing between lists and the paragraphs within them
...
Change-Id: I792cca40a4cca6f811d1528219e51b3895d4d626
2012-09-18 11:27:59 -07:00
Daniel Sandler
ed9a2106a1
Merge "Remove WebViewDream from the build." into jb-mr1-dev
2012-09-18 10:35:25 -07:00
The Android Automerger
973c18c958
JOO80
2012-09-18 07:02:04 -07:00
The Android Automerger
f36b5a9df7
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-18 06:59:21 -07:00
The Android Automerger
9abc4e2b8a
JOO79B
2012-09-17 13:51:32 -07:00
The Android Automerger
58ed221a41
JOO79
2012-09-17 06:59:53 -07:00
The Android Automerger
8bfdcbb3bb
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-17 06:59:03 -07:00
The Android Automerger
990d9c7591
JOO78B
2012-09-16 17:13:09 -07:00
The Android Automerger
e87a34c54e
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-16 17:12:08 -07:00
The Android Automerger
18b111ea4d
JOO78
2012-09-16 07:01:30 -07:00
The Android Automerger
f789ac5665
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-16 06:59:17 -07:00
The Android Open Source Project
50ba3615a4
am fd14e242: (-s ours) Reconcile with jb-nakasig-release - do not merge
...
* commit 'fd14e2425fc0d1efa1295d1dbf6b0d1b058730b4':
JGO77
JGO76
2012-09-15 16:09:34 -07:00
The Android Open Source Project
fd14e2425f
Reconcile with jb-nakasig-release - do not merge
...
Change-Id: I48d8019902c8848541677a7ddc1aa63edf74b23c
2012-09-15 08:21:27 -07:00
The Android Automerger
00e84851d1
JGO77
2012-09-15 08:09:11 -07:00
The Android Automerger
c83498786f
merge in jb-nakasig-release history after reset to jb-dev
2012-09-15 08:09:03 -07:00
The Android Automerger
5db9eba98d
JOO76E
2012-09-14 18:17:50 -07:00
The Android Automerger
9163bacdf9
JOO76D
2012-09-14 17:32:39 -07:00
The Android Automerger
62e2f88d92
JOO76C
2012-09-14 14:11:28 -07:00
The Android Automerger
39b41ecf34
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-14 14:10:09 -07:00
The Android Automerger
53aa4e5064
JOO76B
2012-09-14 09:43:38 -07:00
The Android Automerger
a3f28386a8
JGO76
2012-09-14 08:09:16 -07:00
The Android Automerger
f56c052309
merge in jb-nakasig-release history after reset to jb-dev
2012-09-14 08:09:01 -07:00
Jean-Baptiste Queru
b0cba16a6d
am 7916e624: (-s ours) am a0689075: Update version number for AOSP master
...
* commit '7916e624bd0f084b945ec39dd258057ed8e5dd6f':
Update version number for AOSP master
2012-09-14 07:50:25 -07:00
Jean-Baptiste Queru
7916e624bd
am a0689075: Update version number for AOSP master
...
* commit 'a06890757028f7f8ae77a2c7616885a800aee15f':
Update version number for AOSP master
2012-09-14 07:45:44 -07:00
Jean-Baptiste Queru
a068907570
Update version number for AOSP master
...
Change-Id: I5bc11420932d62a2f6bc12410fe7c8ac2dca069b
2012-09-14 07:43:41 -07:00
The Android Automerger
259cd9685c
JOO76
2012-09-14 07:14:02 -07:00
The Android Automerger
e287e0dfc4
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-14 07:11:00 -07:00
The Android Automerger
2028de7ba9
JOO75B
2012-09-13 15:43:28 -07:00
Daniel Sandler
84f3b02468
Remove WebViewDream from the build.
...
It will remain in AOSP as sample code.
Change-Id: I253034f45d7008beadf9220f6e13a76c3ead3490
2012-09-13 13:06:43 -07:00
The Android Open Source Project
e4f72f8207
am fc9e3924: (-s ours) Reconcile with jb-nakasig-release - do not merge
...
* commit 'fc9e3924a2b9daa55818d7f0b1d819bf171535f5':
JGO75
JGO74
2012-09-13 11:27:46 -07:00
The Android Open Source Project
fc9e3924a2
Reconcile with jb-nakasig-release - do not merge
...
Change-Id: Ic4af6ed24af4503222b6b31e87a2e45fc07cb47e
2012-09-13 11:25:29 -07:00
The Android Automerger
024057416c
JGO75
2012-09-13 08:09:21 -07:00
The Android Automerger
0fdeac4a6b
merge in jb-nakasig-release history after reset to jb-dev
2012-09-13 08:09:05 -07:00
The Android Automerger
6cc77ba6e7
JOO75
2012-09-13 07:01:36 -07:00
The Android Automerger
34292aa306
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-13 06:59:19 -07:00
The Android Automerger
c2796ebb57
JOO74D
2012-09-12 19:10:24 -07:00
The Android Automerger
e60a2e82db
JOO74C
2012-09-12 17:31:38 -07:00
Andrew Hsieh
5630521aba
resolved conflicts for merge of 3e91f5ad to jb-mr1-dev
...
Change-Id: I9b587bc6086e1edacc98879e43668001bf72f7db
2012-09-12 15:27:59 -07:00
Benoit Goby
063d0c5dee
Merge "Add openssl to TINY_ANDROID build" into jb-mr1-dev
2012-09-12 14:50:55 -07:00
Andrew Hsieh
3e91f5ad76
am 0f47a94d: am 7e300d60: Merge "Enable stack-protector for x86"
...
* commit '0f47a94d2eb50f30b7f559c7c7fc2a8632412cc8':
Enable stack-protector for x86
2012-09-12 14:21:07 -07:00
Andrew Hsieh
0f47a94d2e
am 7e300d60: Merge "Enable stack-protector for x86"
...
* commit '7e300d60bfc325e3cbf3e7656297c14109e513b8':
Enable stack-protector for x86
2012-09-12 14:20:11 -07:00
Andrew Hsieh
7e300d60bf
Merge "Enable stack-protector for x86"
2012-09-12 13:44:01 -07:00
