OSDN Git Service
The Android Automerger [Mon, 24 Sep 2012 01:59:34 +0000 (18:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Ying Wang [Sun, 23 Sep 2012 20:46:58 +0000 (13:46 -0700)]
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
The Android Automerger [Sun, 23 Sep 2012 13:59:48 +0000 (06:59 -0700)]
JOO85
The Android Automerger [Sun, 23 Sep 2012 13:59:04 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Sat, 22 Sep 2012 16:44:00 +0000 (09:44 -0700)]
JOO84
The Android Automerger [Sat, 22 Sep 2012 16:41:22 +0000 (09:41 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Fri, 21 Sep 2012 23:26:24 +0000 (16:26 -0700)]
JOO83C
Siva Velusamy [Fri, 21 Sep 2012 21:09:57 +0000 (14:09 -0700)]
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
The Android Automerger [Fri, 21 Sep 2012 22:40:59 +0000 (15:40 -0700)]
JOO83B
Siva Velusamy [Fri, 21 Sep 2012 22:00:27 +0000 (15:00 -0700)]
Merge "Include videoeditor_jni in sdk product build." into jb-mr1-dev
Scott Main [Fri, 21 Sep 2012 21:56:35 +0000 (14:56 -0700)]
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
Scott Main [Fri, 21 Sep 2012 21:54:09 +0000 (14:54 -0700)]
am
582db97b: add style for code captions; ignore sidenav headers for HRs
* commit '
582db97b23982f8e9cac7926ac3f5806b6a9cc71':
add style for code captions; ignore sidenav headers for HRs
Scott Main [Fri, 21 Sep 2012 21:33:43 +0000 (14:33 -0700)]
add style for code captions;
ignore sidenav headers for HRs
Change-Id: I6eb11d3629dd13d2c7ac297cc9fa3828ed59f170
Siva Velusamy [Fri, 21 Sep 2012 21:09:57 +0000 (14:09 -0700)]
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
The Android Automerger [Fri, 21 Sep 2012 14:01:59 +0000 (07:01 -0700)]
JOO83
The Android Automerger [Fri, 21 Sep 2012 13:59:15 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Keun young Park [Thu, 20 Sep 2012 20:50:02 +0000 (13:50 -0700)]
fix PDK build
- build tools not coming from prebuilts for PDK
Change-Id: I5760a54f502b8aa2167976c8f1e17412f31c6f5f
Ying Wang [Thu, 20 Sep 2012 17:37:39 +0000 (10:37 -0700)]
Use prebuilt for PDK builds.
Change-Id: Ief723fe137b7a3aa051837e3ca1079fea772357d
The Android Automerger [Fri, 21 Sep 2012 00:46:51 +0000 (17:46 -0700)]
JOO82C
Ying Wang [Fri, 21 Sep 2012 00:12:00 +0000 (17:12 -0700)]
Merge "Allow to tag owner to PRODUCT_COPY_FILES" into jb-mr1-dev
Zhihai Xu [Thu, 20 Sep 2012 23:42:46 +0000 (16:42 -0700)]
Merge "ISSUE
6849488 Bluedroid stack, remove system/bluetooth." into jb-mr1-dev
Ying Wang [Thu, 20 Sep 2012 23:35:36 +0000 (16:35 -0700)]
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
The Android Automerger [Thu, 20 Sep 2012 21:44:11 +0000 (14:44 -0700)]
JOO82B
Keun young Park [Thu, 20 Sep 2012 21:34:47 +0000 (14:34 -0700)]
Merge "fix PDK build" into jb-mr1-dev
Keun young Park [Thu, 20 Sep 2012 20:50:02 +0000 (13:50 -0700)]
fix PDK build
- build tools not coming from prebuilts for PDK
Change-Id: I5760a54f502b8aa2167976c8f1e17412f31c6f5f
Ying Wang [Thu, 20 Sep 2012 21:07:36 +0000 (14:07 -0700)]
Merge "Move AndroidConfig.h from system/core to the build project." into jb-mr1-dev
Doug Zongker [Thu, 20 Sep 2012 19:02:23 +0000 (12:02 -0700)]
Merge "fix merge-event-log-tags.py deprecation warning" into jb-mr1-dev
Doug Zongker [Thu, 20 Sep 2012 18:50:34 +0000 (11:50 -0700)]
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
Zhihai Xu [Wed, 19 Sep 2012 21:36:03 +0000 (14:36 -0700)]
ISSUE
6849488 Bluedroid stack, remove system/bluetooth.
remove system/bluetooth stuff.
bug
6849488
Change-Id: I8eb85c6da0aa34aefda2916f2c74e5eae51da27e
Ying Wang [Thu, 20 Sep 2012 17:37:39 +0000 (10:37 -0700)]
Use prebuilt for PDK builds.
Change-Id: Ief723fe137b7a3aa051837e3ca1079fea772357d
Ying Wang [Thu, 20 Sep 2012 17:06:33 +0000 (10:06 -0700)]
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
The Android Automerger [Thu, 20 Sep 2012 14:01:57 +0000 (07:01 -0700)]
JOO82
The Android Automerger [Thu, 20 Sep 2012 13:59:18 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Ying Wang [Thu, 20 Sep 2012 00:51:21 +0000 (17:51 -0700)]
Use prebuilt signapk.jar for unbundled branch.
Change-Id: I762b23931042f7ffde829aaf928f54df46a49d78
The Android Automerger [Thu, 20 Sep 2012 00:38:33 +0000 (17:38 -0700)]
JOO81C
The Android Automerger [Wed, 19 Sep 2012 21:09:41 +0000 (14:09 -0700)]
JOO81B
The Android Automerger [Wed, 19 Sep 2012 14:02:52 +0000 (07:02 -0700)]
JOO81
The Android Automerger [Wed, 19 Sep 2012 14:01:27 +0000 (07:01 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
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
The Android Automerger [Tue, 18 Sep 2012 23:27:51 +0000 (16:27 -0700)]
JOO80C
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
The Android Automerger [Tue, 18 Sep 2012 21:22:19 +0000 (14:22 -0700)]
JOO80B
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:35:24 +0000 (10:35 -0700)]
Merge "Remove WebViewDream from the build." into jb-mr1-dev
The Android Automerger [Tue, 18 Sep 2012 14:02:04 +0000 (07:02 -0700)]
JOO80
The Android Automerger [Tue, 18 Sep 2012 13:59:21 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Mon, 17 Sep 2012 20:51:32 +0000 (13:51 -0700)]
JOO79B
The Android Automerger [Mon, 17 Sep 2012 13:59:53 +0000 (06:59 -0700)]
JOO79
The Android Automerger [Mon, 17 Sep 2012 13:59:03 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Mon, 17 Sep 2012 00:13:09 +0000 (17:13 -0700)]
JOO78B
The Android Automerger [Mon, 17 Sep 2012 00:12:08 +0000 (17:12 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Sun, 16 Sep 2012 14:01:30 +0000 (07:01 -0700)]
JOO78
The Android Automerger [Sun, 16 Sep 2012 13:59:17 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
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 [Sat, 15 Sep 2012 01:17:50 +0000 (18:17 -0700)]
JOO76E
The Android Automerger [Sat, 15 Sep 2012 00:32:39 +0000 (17:32 -0700)]
JOO76D
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
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: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
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: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