The Android Open Source Project
96b17f8e99
am a8a731bf
: (-s ours) Reconcile with jb-mr0-release - do not merge
...
* commit 'a8a731bf7fe8d42af56c7481acd99628dd1df2f0':
JZO54I
2012-09-26 09:00:24 -07:00
The Android Open Source Project
a8a731bf7f
Reconcile with jb-mr0-release - do not merge
...
Change-Id: Ia744536ee9da563e661fdcd84defb22720d76309
2012-09-26 08:58:17 -07:00
The Android Automerger
ba7bed7552
JZO54I
2012-09-25 21:50:16 -07:00
Bart Sears
0b7e0983d4
Merge "Add the new NanumGothic makefile to the build" into jb-mr1-dev
2012-09-24 13:06:06 -07:00
Siva Velusamy
53e714209b
Revert "Include videoeditor_jni in sdk product build."
...
This reverts commit 997e629d6d
.
2012-09-24 10:24:17 -07:00
The Android Open Source Project
cc71f1ea0b
am d50926a0
: (-s ours) Reconcile with jb-mr0-release - do not merge
...
* commit 'd50926a047d51f950cbe6c7588d4b168e0cfc3bb':
JZO54H
2012-09-24 08:26:41 -07:00
The Android Open Source Project
d50926a047
Reconcile with jb-mr0-release - do not merge
...
Change-Id: I41bb7c5875f0eef1fd8c31f98f628718a966eddc
2012-09-24 07:38:53 -07:00
Bart Sears
04873af062
Add the new NanumGothic makefile to the build
...
There are separate CLs to add the NanumGothic font files
and makefiles.
Bug: 4531601
Change-Id: Id27f9ff6eb45f666f7f62f1dbe7a06c96c0a717e
2012-09-24 00:11:00 -07:00
Ying Wang
f8f2b022e9
Ignore support library Proguard warning
...
The support library contains references to newer platform versions.
Don't warn about those in case this app is linking against an older
platform version. We know about them, and they are safe.
Change-Id: Ia2a90398b1db1858d005ec09ded56751cc6ffb00
2012-09-23 13:46:58 -07:00
The Android Automerger
b097af8279
JZO54H
2012-09-21 18:02:14 -07:00
Siva Velusamy
32130c6d09
Merge "Include videoeditor_jni in sdk product build." into jb-mr1-dev
2012-09-21 15:00:28 -07:00
Scott Main
57a0a4c1fe
am dcce7ca6
: am 582db97b
: add style for code captions; ignore sidenav headers for HRs
...
* commit 'dcce7ca6a82cf08a7047d0fd23ba05b47be831c1':
add style for code captions; ignore sidenav headers for HRs
2012-09-21 14:56:35 -07:00
Scott Main
dcce7ca6a8
am 582db97b
: add style for code captions; ignore sidenav headers for HRs
...
* commit '582db97b23982f8e9cac7926ac3f5806b6a9cc71':
add style for code captions; ignore sidenav headers for HRs
2012-09-21 14:54:09 -07:00
Scott Main
582db97b23
add style for code captions;
...
ignore sidenav headers for HRs
Change-Id: I6eb11d3629dd13d2c7ac297cc9fa3828ed59f170
2012-09-21 14:33:43 -07:00
Siva Velusamy
997e629d6d
Include videoeditor_jni in sdk product build.
...
frameworks/base/media depends on libvideoeditor_jni. This change
copies the dependencies from generic_no_telephony.mk
Fixes Bug 7200384
Change-Id: I135fd4fc613d81aa962bcdf2573894a2ea8ab11d
2012-09-21 14:23:50 -07:00
Ying Wang
20a7c2c10d
Merge "Allow to tag owner to PRODUCT_COPY_FILES" into jb-mr1-dev
2012-09-20 17:12:01 -07:00
Zhihai Xu
d81b9d220e
Merge "ISSUE 6849488 Bluedroid stack, remove system/bluetooth." into jb-mr1-dev
2012-09-20 16:42:47 -07:00
Ying Wang
4b0486b4a6
Allow to tag owner to PRODUCT_COPY_FILES
...
PRODUCT_COPY_FILES now is a list of words like <source
path>:<destination path>[:<owner>].
The optional :<owner> is used to indicate the owner of a vendor file.
Bug: 7048854
Change-Id: I435d1e18b7a091fb62513062cfc2e420e51557ec
2012-09-20 16:37:55 -07:00
Keun young Park
fe1d3b12de
Merge "fix PDK build" into jb-mr1-dev
2012-09-20 14:34:48 -07:00
Keun young Park
6530b38d7c
fix PDK build
...
- build tools not coming from prebuilts for PDK
Change-Id: I5760a54f502b8aa2167976c8f1e17412f31c6f5f
2012-09-20 14:31:17 -07:00
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
Zhihai Xu
3849760809
ISSUE 6849488 Bluedroid stack, remove system/bluetooth.
...
remove system/bluetooth stuff.
bug 6849488
Change-Id: I8eb85c6da0aa34aefda2916f2c74e5eae51da27e
2012-09-20 10:50:56 -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