OSDN Git Service
Scott Main [Wed, 3 Oct 2012 04:07:42 +0000 (21:07 -0700)]
am
83fca03d: (-s ours) am
5150b1f7: am
f3d0104a: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id: Iaab2b30349943a236607d54394019fa8d89de800
* commit '
83fca03d080b88d5ecda75f6c5b5a1f44fa25d8f':
DO NOT MERGE cherrypick from jb-dev Change-Id: Iaab2b30349943a236607d54394019fa8d89de800
Scott Main [Wed, 3 Oct 2012 04:07:40 +0000 (21:07 -0700)]
am
c914b5bf: (-s ours) am
142158bd: am
6eb95f1a: (-s ours) DO NOT MERGE cherypick from jb-dev Change-Id: Ifcae4fcf716c8bb48f3ff18f17313b3f131c3f73
* commit '
c914b5bf5224f2d5fcc24026c35c2e4ffd7588d7':
DO NOT MERGE cherypick from jb-dev Change-Id: Ifcae4fcf716c8bb48f3ff18f17313b3f131c3f73
Scott Main [Wed, 3 Oct 2012 04:05:26 +0000 (21:05 -0700)]
am
5150b1f7: am
f3d0104a: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id: Iaab2b30349943a236607d54394019fa8d89de800
* commit '
5150b1f770301f5359c07da1be5ce0fdaf342ba9':
DO NOT MERGE cherrypick from jb-dev Change-Id: Iaab2b30349943a236607d54394019fa8d89de800
Scott Main [Wed, 3 Oct 2012 04:05:25 +0000 (21:05 -0700)]
am
142158bd: am
6eb95f1a: (-s ours) DO NOT MERGE cherypick from jb-dev Change-Id: Ifcae4fcf716c8bb48f3ff18f17313b3f131c3f73
* commit '
142158bd218421741d6d133e9ebbb1203ae6e6a6':
DO NOT MERGE cherypick from jb-dev Change-Id: Ifcae4fcf716c8bb48f3ff18f17313b3f131c3f73
Scott Main [Wed, 3 Oct 2012 04:04:28 +0000 (21:04 -0700)]
am
f3d0104a: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id: Iaab2b30349943a236607d54394019fa8d89de800
* commit '
f3d0104a8039af22daab02a914c6639fe078c9a6':
DO NOT MERGE cherrypick from jb-dev Change-Id: Iaab2b30349943a236607d54394019fa8d89de800
Scott Main [Wed, 3 Oct 2012 04:04:11 +0000 (21:04 -0700)]
am
4f5f71a1: (-s ours) am
f5878b3e: am
aa2ce5d9: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id: I90412e1e03a2676d927796187fe811481bf38455 add localize langs for global strings
* commit '
4f5f71a17d8963acf3642c91e3fb711d5f11a99c':
DO NOT MERGE cherrypick from jb-dev Change-Id: I90412e1e03a2676d927796187fe811481bf38455 add localize langs for global strings
Scott Main [Wed, 3 Oct 2012 04:03:18 +0000 (21:03 -0700)]
am
6eb95f1a: (-s ours) DO NOT MERGE cherypick from jb-dev Change-Id: Ifcae4fcf716c8bb48f3ff18f17313b3f131c3f73
* commit '
6eb95f1ac83a02a7bdb68cdcc5a09e7079ff46c0':
DO NOT MERGE cherypick from jb-dev Change-Id: Ifcae4fcf716c8bb48f3ff18f17313b3f131c3f73
Scott Main [Wed, 3 Oct 2012 04:03:01 +0000 (21:03 -0700)]
am
f5878b3e: am
aa2ce5d9: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id: I90412e1e03a2676d927796187fe811481bf38455 add localize langs for global strings
* commit '
f5878b3ea31a04d13888f14bd652340da8a38437':
DO NOT MERGE cherrypick from jb-dev Change-Id: I90412e1e03a2676d927796187fe811481bf38455 add localize langs for global strings
Scott Main [Wed, 3 Oct 2012 04:02:46 +0000 (21:02 -0700)]
am
589622a4: (-s ours) am
e0cc9e30: am
24bbcd50: (-s ours) DO NOT MERGE cherrypick from jb-devChange-Id: I6eb11d3629dd13d2c7ac297cc9fa3828ed59f170 add style for code captions; ignore sidenav headers for HRs
* commit '
589622a47da216ab2b31e94011ae9985e4029891':
DO NOT MERGE cherrypick from jb-devChange-Id: I6eb11d3629dd13d2c7ac297cc9fa3828ed59f170 add style for code captions; ignore sidenav headers for HRs
Scott Main [Wed, 3 Oct 2012 03:36:45 +0000 (20:36 -0700)]
DO NOT MERGE
cherrypick from jb-dev Change-Id: Iaab2b30349943a236607d54394019fa8d89de800
provide more width for buttons in training top nav to accomodate longer
strings from translation
Change-Id: Ia1d8f7caa532ad1060d8a54fda082ada754c1f48
Scott Main [Wed, 3 Oct 2012 04:01:07 +0000 (21:01 -0700)]
am
aa2ce5d9: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id: I90412e1e03a2676d927796187fe811481bf38455 add localize langs for global strings
* commit '
aa2ce5d9aa16d72e4f5c4203bc9a8c6f87d83719':
DO NOT MERGE cherrypick from jb-dev Change-Id: I90412e1e03a2676d927796187fe811481bf38455 add localize langs for global strings
Scott Main [Wed, 3 Oct 2012 00:12:23 +0000 (17:12 -0700)]
DO NOT MERGE
cherypick from jb-dev Change-Id: Ifcae4fcf716c8bb48f3ff18f17313b3f131c3f73
refactor the logic for changing languages in global strings.
instead of using separate <span> elements for each language,
provide a unique attribute in each <a> element for each localized
version of that link's title.
Change-Id: I09c65a8dce9b3d9623e32fe17876b055e452618b
Scott Main [Wed, 3 Oct 2012 04:00:33 +0000 (21:00 -0700)]
am
e0cc9e30: am
24bbcd50: (-s ours) DO NOT MERGE cherrypick from jb-devChange-Id: I6eb11d3629dd13d2c7ac297cc9fa3828ed59f170 add style for code captions; ignore sidenav headers for HRs
* commit '
e0cc9e30520b0fb7690b3f4724fc0ce77c7f03e4':
DO NOT MERGE cherrypick from jb-devChange-Id: I6eb11d3629dd13d2c7ac297cc9fa3828ed59f170 add style for code captions; ignore sidenav headers for HRs
Scott Main [Wed, 3 Oct 2012 04:00:19 +0000 (21:00 -0700)]
am
6856ef5b: (-s ours) am
61e63c8a: am
52948fcf: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id: I792cca40a4cca6f811d1528219e51b3895d4d626 create consistent spacing between lists and the paragraphs within them
* commit '
6856ef5b07b128ecb5daa966f7486503b9cc5f20':
DO NOT MERGE cherrypick from jb-dev Change-Id: I792cca40a4cca6f811d1528219e51b3895d4d626 create consistent spacing between lists and the paragraphs within them
Scott Main [Wed, 3 Oct 2012 03:59:09 +0000 (20:59 -0700)]
am
61e63c8a: am
52948fcf: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id: I792cca40a4cca6f811d1528219e51b3895d4d626 create consistent spacing between lists and the paragraphs within them
* commit '
61e63c8a4bdb6174a08023d4b55fe2af896ed878':
DO NOT MERGE cherrypick from jb-dev Change-Id: I792cca40a4cca6f811d1528219e51b3895d4d626 create consistent spacing between lists and the paragraphs within them
Scott Main [Wed, 3 Oct 2012 03:58:54 +0000 (20:58 -0700)]
am
24bbcd50: (-s ours) DO NOT MERGE cherrypick from jb-devChange-Id: I6eb11d3629dd13d2c7ac297cc9fa3828ed59f170 add style for code captions; ignore sidenav headers for HRs
* commit '
24bbcd5026cd8de5a77cd09ec8754753fff2280b':
DO NOT MERGE cherrypick from jb-devChange-Id: I6eb11d3629dd13d2c7ac297cc9fa3828ed59f170 add style for code captions; ignore sidenav headers for HRs
Scott Main [Sat, 22 Sep 2012 03:32:56 +0000 (20:32 -0700)]
DO NOT MERGE
cherrypick from jb-dev Change-Id: I90412e1e03a2676d927796187fe811481bf38455
add localize langs for global strings
Change-Id: I02b6c5b5d83247a352dc041e9885befe82502adc
Scott Main [Wed, 3 Oct 2012 03:57:44 +0000 (20:57 -0700)]
am
52948fcf: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id: I792cca40a4cca6f811d1528219e51b3895d4d626 create consistent spacing between lists and the paragraphs within them
* commit '
52948fcf8ccdad1f4ba91d63ece2022e2d807aff':
DO NOT MERGE cherrypick from jb-dev Change-Id: I792cca40a4cca6f811d1528219e51b3895d4d626 create consistent spacing between lists and the paragraphs within them
Scott Main [Fri, 21 Sep 2012 21:33:43 +0000 (14:33 -0700)]
DO NOT MERGE
cherrypick from jb-devChange-Id: I6eb11d3629dd13d2c7ac297cc9fa3828ed59f170
add style for code captions;
ignore sidenav headers for HRs
Change-Id: Ic7768dc388a3871be8b02634e2b70f360a62e407
Scott Main [Tue, 18 Sep 2012 18:27:59 +0000 (11:27 -0700)]
DO NOT MERGE
cherrypick from jb-dev Change-Id: I792cca40a4cca6f811d1528219e51b3895d4d626
create consistent spacing between lists and the paragraphs within them
Change-Id: I4977e4f6f34c7fb8605c861ebb4b33895f630977
Scott Main [Wed, 3 Oct 2012 03:42:29 +0000 (20:42 -0700)]
am
2452b062: am
0c81a130: provide more width for buttons in training top nav to accomodate longer strings from translation
* commit '
2452b0625c18bb11a37eb9216078a83f41971240':
provide more width for buttons in training top nav to accomodate longer strings from translation
Scott Main [Wed, 3 Oct 2012 03:40:14 +0000 (20:40 -0700)]
am
0c81a130: provide more width for buttons in training top nav to accomodate longer strings from translation
* commit '
0c81a130ef01981a0cbc3564c26658c51951812d':
provide more width for buttons in training top nav to accomodate longer strings from translation
Scott Main [Wed, 3 Oct 2012 03:36:45 +0000 (20:36 -0700)]
provide more width for buttons in training top nav to accomodate longer
strings from translation
Change-Id: Iaab2b30349943a236607d54394019fa8d89de800
Scott Main [Wed, 3 Oct 2012 03:32:11 +0000 (20:32 -0700)]
am
b649b416: am
235f4d4f: refactor the logic for changing languages in global strings. instead of using separate <span> elements for each language, provide a unique attribute in each <a> element for each localized version of that link\'s title.
* commit '
b649b41604822cc0c9c32b3bc98233a8ab1148c9':
refactor the logic for changing languages in global strings. instead of using separate <span> elements for each language, provide a unique attribute in each <a> element for each localized version of that link's title.
Scott Main [Wed, 3 Oct 2012 03:29:45 +0000 (20:29 -0700)]
am
235f4d4f: refactor the logic for changing languages in global strings. instead of using separate <span> elements for each language, provide a unique attribute in each <a> element for each localized version of that link\'s title.
* commit '
235f4d4f8580a56d553e19c1beab1f8c22132e84':
refactor the logic for changing languages in global strings. instead of using separate <span> elements for each language, provide a unique attribute in each <a> element for each localized version of that link's title.
Scott Main [Wed, 3 Oct 2012 00:12:23 +0000 (17:12 -0700)]
refactor the logic for changing languages in global strings.
instead of using separate <span> elements for each language,
provide a unique attribute in each <a> element for each localized
version of that link's title.
Change-Id: Ifcae4fcf716c8bb48f3ff18f17313b3f131c3f73
Scott Main [Tue, 2 Oct 2012 21:49:07 +0000 (14:49 -0700)]
am
74811834: am
dd3d3eea: add localize langs for global strings
* commit '
748118343d76ed8b48c7b9ff48cbed8e2ab44ebb':
add localize langs for global strings
The Android Open Source Project [Tue, 2 Oct 2012 21:49:06 +0000 (14:49 -0700)]
am
a6c77d92: (-s ours) Reconcile with jb-mr0-release jb-release - do not merge
* commit '
a6c77d92fcbc2a39758ab28c32b701025d637a7b':
JZO54K
JRO03X
Scott Main [Tue, 2 Oct 2012 21:47:52 +0000 (14:47 -0700)]
am
dd3d3eea: add localize langs for global strings
* commit '
dd3d3eea1d953e4a174edb6e75cfdf0fcf03060f':
add localize langs for global strings
The Android Open Source Project [Tue, 2 Oct 2012 21:47:23 +0000 (14:47 -0700)]
Reconcile with jb-mr0-release jb-release - do not merge
Change-Id: I4a96ee0e6bfce143dcf36ad1831f5fbe41965a83
Scott Main [Sat, 22 Sep 2012 03:32:56 +0000 (20:32 -0700)]
add localize langs for global strings
Change-Id: I90412e1e03a2676d927796187fe811481bf38455
The Android Automerger [Tue, 2 Oct 2012 20:59:47 +0000 (13:59 -0700)]
JZO54K
Ian Rogers [Mon, 1 Oct 2012 23:36:23 +0000 (16:36 -0700)]
Fix common typo in comments, warning and error messages.
s/can not/cannot/g
Change-Id: I1bac31157732666deb46f6f20389ff539977ffb9
The Android Automerger [Fri, 28 Sep 2012 23:24:01 +0000 (16:24 -0700)]
JRO03X
Ying Wang [Fri, 28 Sep 2012 22:11:10 +0000 (15:11 -0700)]
Merge "Load only the current product config makefile." into jb-mr1-dev
Ying Wang [Thu, 27 Sep 2012 20:26:25 +0000 (13:26 -0700)]
Load only the current product config makefile.
To reduce the start time.
With the change and previous change of doing clean step in only given paths,
start time of mm/mmm is reduced from ~5s to about 1s;
lunch time is reduced from ~40s to 3.5s.
Bug:
7186768,
7169854
Change-Id: Ifd72ba1c6362a5e1125a23c505fd47947ab56675
The Android Open Source Project [Fri, 28 Sep 2012 19:58:26 +0000 (12:58 -0700)]
am
91f71ca3: (-s ours) Reconcile with jb-mr0-release - do not merge
* commit '
91f71ca30ffd88a1d90abb09d4a677f1a4a35938':
JZO54J
The Android Open Source Project [Fri, 28 Sep 2012 19:52:59 +0000 (12:52 -0700)]
Reconcile with jb-mr0-release - do not merge
Change-Id: Ia64b2e21461cd8db90a733432dd859824950c211
The Android Automerger [Fri, 28 Sep 2012 18:59:46 +0000 (11:59 -0700)]
JZO54J
Ying Wang [Fri, 28 Sep 2012 17:24:40 +0000 (10:24 -0700)]
Merge "Run clean steps in only given paths when using mm/mmm" into jb-mr1-dev
Ying Wang [Wed, 26 Sep 2012 23:00:54 +0000 (16:00 -0700)]
Run clean steps in only given paths when using mm/mmm
To speed up mm/mmm start time.
At the same time, we should copy over the other clean steps.
Bug:
7186768
Change-Id: I250e64256343afe788d79817af36eafaadb47028
Dianne Hackborn [Thu, 27 Sep 2012 22:10:40 +0000 (15:10 -0700)]
Look, up in the sky! It's a bird! It's a plane! It's Android 4.2 API 17!
Change-Id: I577aa38525b23f297e3e2c4a745819ac87b24f6d
Dianne Hackborn [Wed, 26 Sep 2012 22:25:22 +0000 (15:25 -0700)]
Merge "Make runhat command work again." into jb-mr1-dev
Dianne Hackborn [Wed, 26 Sep 2012 22:00:59 +0000 (15:00 -0700)]
Make runhat command work again.
Change-Id: Ia3d2aefd32579b61da72e65c78dc6053dbaaad28
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:06:06 +0000 (13:06 -0700)]
Merge "Add the new NanumGothic makefile to the build" into jb-mr1-dev
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 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
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
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 [Sat, 22 Sep 2012 01:02:14 +0000 (18:02 -0700)]
JZO54H
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
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
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
Ying Wang [Thu, 20 Sep 2012 00:51:21 +0000 (17:51 -0700)]
Use prebuilt signapk.jar for unbundled branch.
Change-Id: I762b23931042f7ffde829aaf928f54df46a49d78
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 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
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 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 [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
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
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"
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