Elliott Hughes
25b3416960
am f153ed38: (-s ours) am f4b34b6c: DO NOT MERGE Revert "Add the libcutils localtime_tz and mktime_t extensions to bionic."
...
* commit 'f153ed380d94123d873d7ff04bc9b5b65f989c1d':
DO NOT MERGE Revert "Add the libcutils localtime_tz and mktime_t extensions to bionic."
2012-09-24 10:18:48 -07:00
Elliott Hughes
a9a1d8a5d2
am f4b34b6c: (-s ours) DO NOT MERGE Revert "Add the libcutils localtime_tz and mktime_t extensions to bionic."
...
* commit 'f4b34b6c3942be273ad7298a40be0d312b183aab':
DO NOT MERGE Revert "Add the libcutils localtime_tz and mktime_t extensions to bionic."
2012-09-24 10:16:43 -07:00
Elliott Hughes
f153ed380d
am f4b34b6c: DO NOT MERGE Revert "Add the libcutils localtime_tz and mktime_t extensions to bionic."
...
* commit 'f4b34b6c3942be273ad7298a40be0d312b183aab':
DO NOT MERGE Revert "Add the libcutils localtime_tz and mktime_t extensions to bionic."
2012-09-24 10:16:37 -07:00
The Android Open Source Project
7c7609f95e
am 51d270af: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '51d270af6d9e648fdec43f716833b6f69688048e':
2012-09-24 10:14:49 -07:00
Elliott Hughes
f4b34b6c39
DO NOT MERGE Revert "Add the libcutils localtime_tz and mktime_t extensions to bionic."
...
This reverts commit 3a936a4980046a7eeb8d53a3296058d8f3a1f770.
We don't want this in jb-mr1.
2012-09-24 10:13:12 -07:00
The Android Open Source Project
51d270af6d
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I933866be4d956f18dff51676c8027f807cea26d7
2012-09-24 10:11:18 -07:00
Elliott Hughes
3b6914bf04
Merge "Fix dlsym and dladdr to use load_bias instead of base"
2012-09-24 10:03:51 -07:00
Elliott Hughes
c08088376a
am 82ec6850: am 6c0e373d: am ec432608: am 0c24effd: Merge "Add the libcutils localtime_tz and mktime_t extensions to bionic."
...
* commit '82ec685054bd14e596fcb0661c7f5c398743b4b3':
Add the libcutils localtime_tz and mktime_t extensions to bionic.
2012-09-24 09:48:35 -07:00
Elliott Hughes
9f3c0d32a4
am 6da07f02: am ecf67e15: am 2d51dddf: am 85049ead: Merge "Use hidden visibility for several internal-use-only functions."
...
* commit '6da07f02bd064cfae852df2b8ac82203432aef35':
Use hidden visibility for several internal-use-only functions.
2012-09-24 09:48:34 -07:00
Elliott Hughes
2b83e0e67e
am 0349e3d3: am d2eea0e6: am baa74eff: am 882c6af9: Merge "[MIPS] Add CONFIG_32BIT to kernel_default_arch_macros for MIPS. Some of the required structure definitons are defined under this macro."
...
* commit '0349e3d3ffa411ffd47f005af7f9c5585e469165':
[MIPS] Add CONFIG_32BIT to kernel_default_arch_macros for MIPS. Some of the required structure definitons are defined under this macro.
2012-09-24 09:48:33 -07:00
Elliott Hughes
82ec685054
am 6c0e373d: am ec432608: am 0c24effd: Merge "Add the libcutils localtime_tz and mktime_t extensions to bionic."
...
* commit '6c0e373d38a9cb424bd6d9c4d5d6168960846aa5':
Add the libcutils localtime_tz and mktime_t extensions to bionic.
2012-09-24 09:47:01 -07:00
Elliott Hughes
6da07f02bd
am ecf67e15: am 2d51dddf: am 85049ead: Merge "Use hidden visibility for several internal-use-only functions."
...
* commit 'ecf67e152aecb67bff950d72582ef54b56191096':
Use hidden visibility for several internal-use-only functions.
2012-09-24 09:46:47 -07:00
Elliott Hughes
0349e3d3ff
am d2eea0e6: am baa74eff: am 882c6af9: Merge "[MIPS] Add CONFIG_32BIT to kernel_default_arch_macros for MIPS. Some of the required structure definitons are defined under this macro."
...
* commit 'd2eea0e6d6d4e7c406b06d90316713482d650290':
[MIPS] Add CONFIG_32BIT to kernel_default_arch_macros for MIPS. Some of the required structure definitons are defined under this macro.
2012-09-24 09:46:46 -07:00
Elliott Hughes
6c0e373d38
am ec432608: am 0c24effd: Merge "Add the libcutils localtime_tz and mktime_t extensions to bionic."
...
* commit 'ec4326084ed2a717b3e318f36c2675ef033c30ff':
Add the libcutils localtime_tz and mktime_t extensions to bionic.
2012-09-24 09:40:18 -07:00
Naseer Ahmed
f9355bc5cd
am 21e0a7ee: am f7070074: bionic: Update MDP header for sync
...
* commit '21e0a7ee8bd9862452a429cef554f31e3c379903':
bionic: Update MDP header for sync
2012-09-24 09:36:43 -07:00
Naseer Ahmed
21e0a7ee8b
am f7070074: bionic: Update MDP header for sync
...
* commit 'f707007435ee4798815bd507d86b1460204cfc4f':
bionic: Update MDP header for sync
2012-09-24 09:26:33 -07:00
Elliott Hughes
ec4326084e
am 0c24effd: Merge "Add the libcutils localtime_tz and mktime_t extensions to bionic."
...
* commit '0c24effd01736e533fd082b2cf1de8926b0fe880':
Add the libcutils localtime_tz and mktime_t extensions to bionic.
2012-09-24 08:55:27 -07:00
Elliott Hughes
ecf67e152a
am 2d51dddf: am 85049ead: Merge "Use hidden visibility for several internal-use-only functions."
...
* commit '2d51dddf1a649c73f207ecf48d419fea8a8ed4de':
Use hidden visibility for several internal-use-only functions.
2012-09-24 08:52:15 -07:00
Elliott Hughes
d2eea0e6d6
am baa74eff: am 882c6af9: Merge "[MIPS] Add CONFIG_32BIT to kernel_default_arch_macros for MIPS. Some of the required structure definitons are defined under this macro."
...
* commit 'baa74eff0dd56b1dbf8e8a233a82e6382828ad72':
[MIPS] Add CONFIG_32BIT to kernel_default_arch_macros for MIPS. Some of the required structure definitons are defined under this macro.
2012-09-24 08:52:14 -07:00
Elliott Hughes
2d51dddf1a
am 85049ead: Merge "Use hidden visibility for several internal-use-only functions."
...
* commit '85049ead251b0af9411ada3ad1db0f6b75f8e4a8':
Use hidden visibility for several internal-use-only functions.
2012-09-24 08:43:45 -07:00
Elliott Hughes
baa74eff0d
am 882c6af9: Merge "[MIPS] Add CONFIG_32BIT to kernel_default_arch_macros for MIPS. Some of the required structure definitons are defined under this macro."
...
* commit '882c6af953e5b3fd4b9f4fe74a68128ea16fba3b':
[MIPS] Add CONFIG_32BIT to kernel_default_arch_macros for MIPS. Some of the required structure definitons are defined under this macro.
2012-09-24 08:43:44 -07:00
Elliott Hughes
0c24effd01
Merge "Add the libcutils localtime_tz and mktime_t extensions to bionic."
2012-09-24 08:41:55 -07:00
Elliott Hughes
85049ead25
Merge "Use hidden visibility for several internal-use-only functions."
2012-09-23 11:08:19 -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
Elliott Hughes
95a7a64ac8
Use hidden visibility for several internal-use-only functions.
...
Change-Id: Ibeea6963ff0cc06479d0a3ed7e868eeece8c55a0
2012-09-21 18:27:40 -07:00
Elliott Hughes
882c6af953
Merge "[MIPS] Add CONFIG_32BIT to kernel_default_arch_macros for MIPS. Some of the required structure definitons are defined under this macro."
2012-09-21 18:20:03 -07:00
Raghu Gandham
988ff8ff9f
[MIPS] Add CONFIG_32BIT to kernel_default_arch_macros for MIPS.
...
Some of the required structure definitons are defined under this macro.
Change-Id: I7a9a986e371381697dcb56bd8ea362856ffa7509
2012-09-21 17:14:05 -07:00
Raghu Gandham
c1993cac40
Fix dlsym and dladdr to use load_bias instead of base
...
Change-Id: If0f9aa944ccb1f90451aa6674428e34494331d2d
2012-09-21 17:00:30 -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
Naseer Ahmed
f707007435
bionic: Update MDP header for sync
...
Change-Id: I5e13cdc9132fd99b8072b2e0836b9a92bc54f9c3
2012-09-20 18:29:45 -07:00
Rebecca Schultz Zavin
e06f77dce0
am 27cfd6af: am a9dca773: Update ion header to add FLAG_CACHED_NEEDS_SYNC
...
* commit '27cfd6afd4039a72e3669a2ff32685e81dd455aa':
Update ion header to add FLAG_CACHED_NEEDS_SYNC
2012-09-20 15:46:02 -07:00
Rebecca Schultz Zavin
27cfd6afd4
am a9dca773: Update ion header to add FLAG_CACHED_NEEDS_SYNC
...
* commit 'a9dca77315b85f61e7386ca8dc931f79f6396531':
Update ion header to add FLAG_CACHED_NEEDS_SYNC
2012-09-20 14:00:15 -07:00
The Android Open Source Project
284de14ebb
am 0a6cbb97: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '0a6cbb97a82ac6cfc3ce3d1eaf2785f911600584':
2012-09-20 12:52:38 -07:00
The Android Open Source Project
0a6cbb97a8
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I487c32c629ef85a9aea22fb7564fd868618f56c3
2012-09-20 10:34:47 -07:00
Rebecca Schultz Zavin
a9dca77315
Update ion header to add FLAG_CACHED_NEEDS_SYNC
...
Bug: 6854979
Change-Id: Ic94c1b7b10ab750a6b4b0db83d2fb1fa073d91b9
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
2012-09-20 09:47:37 -07:00
Iliyan Malchev
dcc80e127c
am e5521822: am 4430aa6a: Merge "Update headers for Adreno graphics driver" into jb-mr1-dev
...
* commit 'e55218223b070d5745dc73c5593c436277c5b9c0':
Update headers for Adreno graphics driver
2012-09-19 15:18:52 -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
Iliyan Malchev
e55218223b
am 4430aa6a: Merge "Update headers for Adreno graphics driver" into jb-mr1-dev
...
* commit '4430aa6aaaa8e93bb7fbca761bf18540a7d95ca0':
Update headers for Adreno graphics driver
2012-09-18 20:30:06 -07:00
Iliyan Malchev
4430aa6aaa
Merge "Update headers for Adreno graphics driver" into jb-mr1-dev
2012-09-18 20:27:34 -07:00
Jeff Boody
02e06782fc
Update headers for Adreno graphics driver
...
Change-Id: Ic66de698667c8c8607b2c19712a8626a4651da7f
Signed-off-by: Iliyan Malchev <malchev@google.com>
2012-09-18 19:52:01 -07:00
Elliott Hughes
73b5a72134
am ae0bccf7: am 0ef00090: am 30289f0d: am 47dc4d43: Merge "Make pthread_create more forgiving of invalid sched_policy. Bug: 7005326"
...
* commit 'ae0bccf7d3252900d2ef31df2c6e4515908b89ec':
Make pthread_create more forgiving of invalid sched_policy. Bug: 7005326
2012-09-18 17:31:35 -07:00
Elliott Hughes
ae0bccf7d3
am 0ef00090: am 30289f0d: am 47dc4d43: Merge "Make pthread_create more forgiving of invalid sched_policy. Bug: 7005326"
...
* commit '0ef00090444883508b6405726150fe7e12ca5476':
Make pthread_create more forgiving of invalid sched_policy. Bug: 7005326
2012-09-18 17:26:14 -07:00
Elliott Hughes
0ef0009044
am 30289f0d: am 47dc4d43: Merge "Make pthread_create more forgiving of invalid sched_policy. Bug: 7005326"
...
* commit '30289f0dd6ab644290bfb37b22b03b7d006628f4':
Make pthread_create more forgiving of invalid sched_policy. Bug: 7005326
2012-09-18 17:18:39 -07:00
Elliott Hughes
30289f0dd6
am 47dc4d43: Merge "Make pthread_create more forgiving of invalid sched_policy. Bug: 7005326"
...
* commit '47dc4d431017e701239dd7d9a16333e0ad56a0ac':
Make pthread_create more forgiving of invalid sched_policy. Bug: 7005326
2012-09-18 17:13:15 -07:00
Elliott Hughes
47dc4d4310
Merge "Make pthread_create more forgiving of invalid sched_policy. Bug: 7005326"
2012-09-18 16:56:45 -07:00
Dave Burke
88f1ea8f82
Make pthread_create more forgiving of invalid sched_policy.
...
Bug: 7005326
(cherry-pick of e58303249b9e799a4fe84c5a2dfe71518441a6ec.)
Change-Id: Ie81494e0f6a71caa6fd9fabbcfc47a23077554d6
2012-09-18 16:55:24 -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
Dave Burke
5c5b720d81
am baa09d1e: am e5830324: Make pthread_create more forgiving of invalid sched_policy. Bug: 7005326
...
* commit 'baa09d1e0a408d410fc5a834fe9c283ae589ff13':
Make pthread_create more forgiving of invalid sched_policy. Bug: 7005326
2012-09-18 00:10:52 -07:00
Dave Burke
baa09d1e0a
am e5830324: Make pthread_create more forgiving of invalid sched_policy. Bug: 7005326
...
* commit 'e58303249b9e799a4fe84c5a2dfe71518441a6ec':
Make pthread_create more forgiving of invalid sched_policy. Bug: 7005326
2012-09-18 00:05:21 -07:00
Dave Burke
e58303249b
Make pthread_create more forgiving of invalid sched_policy.
...
Bug: 7005326
Change-Id: I4e33d8e7d70fbfcf8a1bcc0e4c33279b42092a0a
2012-09-17 21:55:24 -07:00