Ying Wang
7884dfc645
Merge "Move AndroidConfig.h from system/core to the build project." into jb-mr1-dev
2012-09-20 14:07:37 -07:00
Doug Zongker
c4d68391cc
Merge "fix merge-event-log-tags.py deprecation warning" into jb-mr1-dev
2012-09-20 12:02:24 -07:00
Doug Zongker
6ce87a1fc8
fix merge-event-log-tags.py deprecation warning
...
Prefer using the hashlib module if it's available, instead of the
deprecated md5 module.
Change-Id: Id5e50af125ae47f34d011d8612059424472c7c3f
2012-09-20 11:50:34 -07:00
Ying Wang
295cf570d6
Use prebuilt for PDK builds.
...
Change-Id: Ief723fe137b7a3aa051837e3ca1079fea772357d
2012-09-20 10:37:39 -07:00
Ying Wang
5bdf305bbe
Move AndroidConfig.h from system/core to the build project.
...
So unbundled branches don't need to include the system/core project.
Change-Id: Ic4ef62ee6df069b9b2dd123aed95a3e7fcdfc146
2012-09-20 10:33:20 -07:00
Ying Wang
4da2f9caaa
Use prebuilt signapk.jar for unbundled branch.
...
Change-Id: I762b23931042f7ffde829aaf928f54df46a49d78
2012-09-19 17:51:21 -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
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
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 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
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
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
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
Scott Main
7d89e1ce07
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>
2012-09-12 10:36:15 -07:00
Scott Main
7832dda030
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>
2012-09-12 10:34:15 -07:00
Scott Main
5b5ff1a6ae
more specific selector for new blockquote style to fix regressions
...
on other pages that use <blockquote>
Change-Id: Icf37f515cfe2204afb58a796222c166088d0f131
2012-09-12 10:29:45 -07:00
The Android Automerger
7da95f74c1
JGO74
2012-09-12 08:09:20 -07:00
The Android Automerger
6ae8299ba6
merge in jb-nakasig-release history after reset to jb-dev
2012-09-12 08:09:04 -07:00
The Android Open Source Project
f5cc87bae4
am 60573fd6: (-s ours) Reconcile with jb-nakasig-release jb-mr0-release - do not merge
...
* commit '60573fd6083162f6a6adaa73e6978c93b76c0cb3':
JZO54G
JGO73
JZO54F
JGO72
JGO71
JGO70
2012-09-12 07:50:14 -07:00
The Android Open Source Project
60573fd608
Reconcile with jb-nakasig-release jb-mr0-release - do not merge
...
Change-Id: Ieff44ac588f6e8b8dd4ec52f28b94d38fbf985ca
2012-09-12 07:49:09 -07:00
The Android Automerger
a5b73475e6
JZO54G
2012-09-11 22:18:30 -07:00
Benoit Goby
bc2406e64c
Add openssl to TINY_ANDROID build
...
adb depends on it
Change-Id: I79f23315142b45bc7f9a2685fa2b9865b22396ad
2012-09-11 17:25:05 -07:00
Scott Main
b050ed294a
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
2012-09-11 14:44:07 -07:00
Scott Main
5f4e1ac6ee
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
2012-09-11 14:42:43 -07:00
Scott Main
ee7cb4637d
Merge "add 'small' style for long headings in Training courses" into jb-dev
2012-09-11 14:41:28 -07:00
Scott Main
6b2dc27c08
add 'small' style for long headings in Training courses
...
Change-Id: I385df22d12ad419ad6883c0e94d3053e7e520a09
2012-09-11 14:27:34 -07:00
Ying Wang
aadbb3d3b2
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.
2012-09-11 12:16:46 -07:00
Ying Wang
930d2b5c3f
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.
2012-09-11 12:14:34 -07:00
Ying Wang
6a6723a0a9
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.
2012-09-11 12:12:23 -07:00
Ying Wang
4458452ef6
Merge "android.core.vm-tests-tf.jar path changed to HOST JAVA_LIBRARIES."
2012-09-11 11:49:11 -07:00
Ying Wang
6adcf0180a
android.core.vm-tests-tf.jar path changed to HOST JAVA_LIBRARIES.
...
Bug: 7019588
Change-Id: I6406110071d891e27df6d1cc562a7baa884b2e9e
2012-09-11 11:47:22 -07:00
The Android Automerger
a33e3b8390
JGO73
2012-09-11 09:54:42 -07:00
The Android Automerger
96051afe4a
merge in jb-nakasig-release history after reset to jb-dev
2012-09-11 09:54:29 -07:00