Baligh Uddin
f7a9a681ab
Merge "resolved conflicts for merge of 05292dd6 to jb-mr1-dev" into jb-mr1-dev
2013-09-25 02:31:09 +00:00
Elliott Hughes
1d69ab1de9
resolved conflicts for merge of 05292dd6 to jb-mr1-dev
...
Change-Id: I051cad5dc3c985f11c52708f4487e64ea45ca617
2013-09-24 15:52:16 -07:00
Jean-Baptiste Queru
e5412a9a95
Reconcile with jb-mr1-release - do not merge
2013-03-11 12:15:11 -07:00
The Android Automerger
f29c214d6a
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-30 20:11:57 -07:00
The Android Automerger
5ba74660e3
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-19 15:45:58 -07:00
The Android Automerger
7cc2dec82e
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-10 14:06:19 -07:00
The Android Automerger
956092e07c
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-03 06:59:12 -07:00
The Android Automerger
f27642c082
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-30 06:59:14 -07:00
The Android Automerger
9014818f61
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-25 06:59:12 -07:00
The Android Automerger
cc95d69c25
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-22 09:41:22 -07:00
The Android Automerger
e0a00a8a2c
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-21 06:59:14 -07:00
The Android Automerger
8ab03a28d0
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-19 07:01:27 -07:00
The Android Automerger
4513ad77ef
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-18 06:59:21 -07:00
The Android Automerger
dd526b010d
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-16 06:59:15 -07:00
The Android Automerger
9d1defbf47
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-14 07:11:00 -07:00
The Android Automerger
f238e06d3a
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-13 06:59:18 -07:00
The Android Automerger
5766b0932f
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-12 06:59:18 -07:00
The Android Automerger
49b5eb4ded
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-11 06:59:14 -07:00
The Android Automerger
9209fd3868
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-09 06:59:39 -07:00
The Android Automerger
abce26b05a
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-06 06:33:25 -07:00
The Android Automerger
3a8807df34
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-05 06:33:22 -07:00
The Android Automerger
2b49277d84
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-03 06:33:17 -07:00
The Android Automerger
83d5e567d6
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-30 06:33:17 -07:00
The Android Automerger
b2d46d3632
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-29 06:33:16 -07:00
The Android Automerger
6fa20f8296
Revert "Update ion header"
...
This reverts commit eb75db7d83
2012-08-28 11:49:35 -07:00
The Android Automerger
4be256b50b
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-28 06:33:16 -07:00
The Android Automerger
19c0b800a3
:Revert "Update ion header"
...
This reverts commit eb75db7d83
2012-08-27 12:46:37 -07:00
The Android Automerger
eeddc30e7e
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-27 06:33:20 -07:00
The Android Automerger
21120f6d7b
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-23 06:33:25 -07:00
Brian Carlstrom
561bf16be5
Revert "Upgrade to dlmalloc 2.8.5."
...
This reverts commit 999089181e
2012-08-22 14:56:19 -07:00
Brian Carlstrom
453294d1da
Revert "Restore posix_memalign"
...
This reverts commit bfc1d97531
2012-08-22 14:56:13 -07:00
The Android Automerger
6773054eb3
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-22 06:33:14 -07:00
The Android Automerger
5d8cfb3e66
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-21 06:33:32 -07:00
The Android Automerger
f706b3dfcf
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-20 06:33:38 -07:00
The Android Automerger
e20afb140c
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-16 06:33:16 -07:00
The Android Automerger
46bb2a222e
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-15 06:33:26 -07:00
The Android Automerger
59b222ac75
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-14 07:06:10 -07:00
The Android Automerger
df0cf64781
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-13 08:09:08 -07:00
The Android Automerger
536b1daf00
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-09 09:29:41 -07:00
The Android Automerger
eeb321c54e
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-07 06:33:32 -07:00
Shih-wei Liao
f4497e15b7
When compiling with clang, don't "fortify_source" the strlcpy and
...
strlcat.
Change-Id: I91f58322f28e425ab9d22b51c23fcd6b772ede97
2012-08-06 13:17:05 -07:00
Shih-wei Liao
a72246d67e
When compiling with clang, don't "fortify_source" the strlen.
...
At this point, FORTIFY_SOURCE and clang are just plain incompatible.
Need to solve the underlying incompatibility first.
Change-Id: I3366477d19461e1ec93b1c30e0c7e8145b391b9b
2012-08-06 13:16:56 -07:00
Shih-wei Liao
5fec211f60
Revert "Fix the clang build: this compiler doesn't support the gnu_inline function attribute"
...
This reverts commit 4f1f149c37
2012-08-06 13:16:48 -07:00
The Android Automerger
7bf1c31cac
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-06 06:27:31 -07:00
Ajay Dudani
5f0701c9fa
Update msm_camera.h to version that supports instance handle based lookup
...
Change-Id: If33a45f378e2cbbfe28b51643808df94e8d1f5e7
2012-08-03 15:02:07 -07:00
The Android Automerger
248321bb6f
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-02 07:41:45 -07:00
The Android Automerger
617a5ee417
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-01 07:10:06 -07:00
The Android Automerger
15e0ca8186
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-07-31 07:35:13 -07:00
Ed Heyl
e5b635c885
am 681ccffb: Merge jb-dev-mako plus fixes to libc/kernel/common/linux/fb.h
...
* commit '681ccffb4593875a3bcc2c17da9713a1215232d9':
bionic: Update MDP and rotator headers
Adding msm_dsps.h header
Update msm headers for audio, camera, ion, charm, rmnet
bionic: Update msm_mdp.h from the kernel
update linux/fb.h to support fb ioctl in kernel 3.4
Use sanitized video decode/encode header files
bionic: Update MDP and KGSL headers
add processed sound/tlv.h header
add processed genlock.h for qualcomm
2012-07-29 22:40:26 -07:00
Elliott Hughes
b7dd54f0c7
am d6c3369c: am 7a450b4d: am 643e5722: Merge "Report errors to the log, not just stderr."
...
* commit 'd6c3369cec68de60dec0d9ab7469457d817539e1':
Report errors to the log, not just stderr.
2012-07-27 18:32:56 -07:00
Elliott Hughes
65b48f892e
am c823b2c7: am 616f3680: am a7916509: Merge "Fix a TEMP_FAILURE_RETRY usage error in the linker."
...
* commit 'c823b2c74137230fc1a166527b5141e3a6bacd65':
Fix a TEMP_FAILURE_RETRY usage error in the linker.
2012-07-27 16:25:03 -07:00
Elliott Hughes
2eb46df63a
am d7dfcb0c: am 514ace95: am 9061c6e7: Merge "Replace ALL_PREBUILTS with BUILD_PREBUILT"
...
* commit 'd7dfcb0cb07bc1bb2b716075697f86de1b4d8e54':
Replace ALL_PREBUILTS with BUILD_PREBUILT
2012-07-27 16:24:50 -07:00
The Android Open Source Project
a1d1abbc26
am 22bd479e: am e35ae86e: Reconcile with jb-release
...
* commit '22bd479e2e8454ed726f8c650e52b78702262d34':
2012-07-27 16:24:00 -07:00
Elliott Hughes
cb9ea8873a
am 408e3e50: am 45038ae4: am 12f411d9: Merge "Correction to use of TEMP_FAILURE_RETRY in send_prop_msg"
...
* commit '408e3e5046ed030c464cdae6c95bc6a9d6de39cc':
Correction to use of TEMP_FAILURE_RETRY in send_prop_msg
2012-07-27 10:21:45 -07:00
Elliott Hughes
6320848df6
am c636ff19: am 9a9ca7c1: am 7d6c3f70: Merge "Remove the \'Factory\' time zone by not processing the \'factory\' file."
...
* commit 'c636ff1944ca9c67953e3162ba7a8c39e44fff42':
Remove the 'Factory' time zone by not processing the 'factory' file.
2012-07-26 22:56:12 -07:00
Ying Wang
186b36b65b
Replace ALL_PREBUILTS with BUILD_PREBUILT
...
Bug: 6857263
Change-Id: Ib639f1c4d572fec088298f95f6d5a2951d56cd12
2012-07-26 15:55:34 -07:00
