OSDN Git Service
The Android Open Source Project [Wed, 26 Sep 2012 16:01:43 +0000 (09:01 -0700)]
am
96b17f8e: am
a8a731bf: (-s ours) Reconcile with jb-mr0-release - do not merge
* commit '
96b17f8e9972cb69e2ae8ce9cb137ecc6ca7763a':
JZO54I
The Android Open Source Project [Wed, 26 Sep 2012 16:00:24 +0000 (09:00 -0700)]
am
a8a731bf: (-s ours) Reconcile with jb-mr0-release - do not merge
* commit '
a8a731bf7fe8d42af56c7481acd99628dd1df2f0':
JZO54I
The Android Open Source Project [Wed, 26 Sep 2012 15:58:17 +0000 (08:58 -0700)]
Reconcile with jb-mr0-release - do not merge
Change-Id: Ia744536ee9da563e661fdcd84defb22720d76309
The Android Automerger [Wed, 26 Sep 2012 04:50:16 +0000 (21:50 -0700)]
JZO54I
Bart Sears [Mon, 24 Sep 2012 20:08:14 +0000 (13:08 -0700)]
am
0b7e0983: Merge "Add the new NanumGothic makefile to the build" into jb-mr1-dev
* commit '
0b7e0983d4dab0796fd37439859250c88142463b':
Add the new NanumGothic makefile to the build
Bart Sears [Mon, 24 Sep 2012 20:06:06 +0000 (13:06 -0700)]
Merge "Add the new NanumGothic makefile to the build" into jb-mr1-dev
Siva Velusamy [Mon, 24 Sep 2012 19:49:21 +0000 (12:49 -0700)]
am
53e71420: Revert "Include videoeditor_jni in sdk product build."
* commit '
53e714209b32599a1fe19a1827f313207e43fd52':
Revert "Include videoeditor_jni in sdk product build."
Siva Velusamy [Fri, 21 Sep 2012 22:23:58 +0000 (15:23 -0700)]
Revert "Include videoeditor_jni in sdk product build."
This reverts commit
997e629d6dca5683af596ba22f564b5346967b95.
The Android Open Source Project [Mon, 24 Sep 2012 17:11:22 +0000 (10:11 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: Idb9359eee8e8aafd50f8bec1202536d842ac8cbb
The Android Open Source Project [Mon, 24 Sep 2012 16:29:40 +0000 (09:29 -0700)]
am
cc71f1ea: am
d50926a0: (-s ours) Reconcile with jb-mr0-release - do not merge
* commit '
cc71f1ea0b090903ea0c9a5b71b1a440c26de101':
JZO54H
Ying Wang [Mon, 24 Sep 2012 15:27:32 +0000 (08:27 -0700)]
am
f8f2b022: Ignore support library Proguard warning
* commit '
f8f2b022e9e6ea218d60eb692ede3e6e48c944af':
Ignore support library Proguard warning
The Android Open Source Project [Mon, 24 Sep 2012 15:26:41 +0000 (08:26 -0700)]
am
d50926a0: (-s ours) Reconcile with jb-mr0-release - do not merge
* commit '
d50926a047d51f950cbe6c7588d4b168e0cfc3bb':
JZO54H
The Android Open Source Project [Mon, 24 Sep 2012 14:38:53 +0000 (07:38 -0700)]
Reconcile with jb-mr0-release - do not merge
Change-Id: I41bb7c5875f0eef1fd8c31f98f628718a966eddc
The Android Automerger [Mon, 24 Sep 2012 13:59:50 +0000 (06:59 -0700)]
JOO86
The Android Automerger [Mon, 24 Sep 2012 13:59:02 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Bart Sears [Mon, 24 Sep 2012 07:11:00 +0000 (00:11 -0700)]
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
The Android Automerger [Mon, 24 Sep 2012 02:00:36 +0000 (19:00 -0700)]
JOO85B
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 [Sat, 22 Sep 2012 01:02:14 +0000 (18:02 -0700)]
JZO54H
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:02:12 +0000 (15:02 -0700)]
am
32130c6d: Merge "Include videoeditor_jni in sdk product build." into jb-mr1-dev
* commit '
32130c6d092223ba91ab4425fe2c40e9e6fde584':
Include videoeditor_jni in sdk product build.
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:58:20 +0000 (14:58 -0700)]
am
57a0a4c1: am
dcce7ca6: am
582db97b: add style for code captions; ignore sidenav headers for HRs
* commit '
57a0a4c1fe29a2fe5fea924bd87554380bc70a9a':
add style for code captions; ignore sidenav headers for HRs
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
Ying Wang [Fri, 21 Sep 2012 03:22:38 +0000 (20:22 -0700)]
am
20a7c2c1: Merge "Allow to tag owner to PRODUCT_COPY_FILES" into jb-mr1-dev
* commit '
20a7c2c10d892ebb8d128794e862ad17ef1056e2':
Allow to tag owner to PRODUCT_COPY_FILES
Zhihai Xu [Fri, 21 Sep 2012 03:22:37 +0000 (20:22 -0700)]
am
d81b9d22: Merge "ISSUE
6849488 Bluedroid stack, remove system/bluetooth." into jb-mr1-dev
* commit '
d81b9d220e00a9ffecea3b9067c6416b2c1e6bbd':
ISSUE
6849488 Bluedroid stack, remove system/bluetooth.
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:36:44 +0000 (14:36 -0700)]
am
fe1d3b12: Merge "fix PDK build" into jb-mr1-dev
* commit '
fe1d3b12de3b9dad5fa1b84115602bd6e9f32767':
fix PDK build
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:08:41 +0000 (14:08 -0700)]
am
7884dfc6: Merge "Move AndroidConfig.h from system/core to the build project." into jb-mr1-dev
* commit '
7884dfc645dba2a36653a190b766a0af492d8079':
Move AndroidConfig.h from system/core to the build project.
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:49:06 +0000 (12:49 -0700)]
am
c4d68391: Merge "fix merge-event-log-tags.py deprecation warning" into jb-mr1-dev
* commit '
c4d68391cc39e56b1471a3f5a8d1efbc123503e6':
fix merge-event-log-tags.py deprecation warning
Ying Wang [Thu, 20 Sep 2012 19:49:05 +0000 (12:49 -0700)]
am
295cf570: Use prebuilt for PDK builds.
* commit '
295cf570d65b52bcc1875be2bfc234af202156f0':
Use prebuilt for PDK builds.
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
The Android Open Source Project [Thu, 20 Sep 2012 17:34:55 +0000 (10:34 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I2574f76e658ad480d22c600a6e1e4f7b251a1749
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 13:08:25 +0000 (06:08 -0700)]
am
4da2f9ca: Use prebuilt signapk.jar for unbundled branch.
* commit '
4da2f9caaab5ad95528eece0453ea95a1aa3a4e5':
Use prebuilt signapk.jar for unbundled branch.
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
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
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
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: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 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: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 [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: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