Elliott Hughes
a7d8f3d50e
am c80ca54f
: am 60ef95e1
: Merge "Enhance getcwd(3) to handle NULL like glibc."
...
* commit 'c80ca54f3cd2d7e20770e286f4478fb589742478':
Enhance getcwd(3) to handle NULL like glibc.
2012-08-16 17:05:40 -07:00
Elliott Hughes
c80ca54f3c
am 60ef95e1
: Merge "Enhance getcwd(3) to handle NULL like glibc."
...
* commit '60ef95e1c1b171635adb4d11289347674b1b8987':
Enhance getcwd(3) to handle NULL like glibc.
2012-08-16 17:04:11 -07:00
Elliott Hughes
60ef95e1c1
Merge "Enhance getcwd(3) to handle NULL like glibc."
2012-08-16 16:58:34 -07:00
Elliott Hughes
04a83a48ed
Enhance getcwd(3) to handle NULL like glibc.
...
Bug: http://code.google.com/p/android/issues/detail?id=36085
Change-Id: I960a1b585887eb66176c61d29c5c61c239a4003f
2012-08-16 15:59:12 -07:00
Elliott Hughes
0a14d9f5c8
am ca82e1f3
: am 820ad428
: am 74438bb2
: am 449d4634
: Merge "bionic: add macro protection for MALLOC_ALIGNMENT"
...
* commit 'ca82e1f3d17b57b1d5bbf0527cae58be1861e9ae':
bionic: add macro protection for MALLOC_ALIGNMENT
2012-08-16 14:28:52 -07:00
Elliott Hughes
ca82e1f3d1
am 820ad428
: am 74438bb2
: am 449d4634
: Merge "bionic: add macro protection for MALLOC_ALIGNMENT"
...
* commit '820ad4283d71c4f2303f80d8ccbe6c90a6ec5407':
bionic: add macro protection for MALLOC_ALIGNMENT
2012-08-16 14:27:28 -07:00
Elliott Hughes
820ad4283d
am 74438bb2
: am 449d4634
: Merge "bionic: add macro protection for MALLOC_ALIGNMENT"
...
* commit '74438bb22505b55ec72224932ae9982fbf9b4b65':
bionic: add macro protection for MALLOC_ALIGNMENT
2012-08-16 14:23:56 -07:00
Elliott Hughes
74438bb225
am 449d4634
: Merge "bionic: add macro protection for MALLOC_ALIGNMENT"
...
* commit '449d4634bea0ff8f6b29a2826871279dd654f941':
bionic: add macro protection for MALLOC_ALIGNMENT
2012-08-16 12:27:47 -07:00
Elliott Hughes
449d4634be
Merge "bionic: add macro protection for MALLOC_ALIGNMENT"
2012-08-16 12:09:13 -07:00
Jin Wei
9862f5e08b
bionic: add macro protection for MALLOC_ALIGNMENT
...
In previous commit: 2fd81ef7
, .mk file has been modified to
configure MALLOC_ALIGNMENT dynamicly according to board config.
Add the missing macor protection here.
Change-Id: I703cca2ce0504ab3e11aab226b2c61fcc0c6afa1
Author: Jin Wei <wei.a.jin@intel.com>
Signed-off-by: Xiaokang Qin <xiaokang.qin@intel.com>
Signed-off-by: Beare, Bruce J <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
2012-08-16 12:08:36 -07:00
Scott Anderson
4628d2f6bb
am cc8165ae
: am 09d9dd3a
: Merge "Add clean kernel header for uhid." into jb-mr1-dev
...
* commit 'cc8165aea50294c6a86ad456967a7a741ac85a65':
Add clean kernel header for uhid.
2012-08-16 12:07:53 -07:00
Scott Anderson
cc8165aea5
am 09d9dd3a
: Merge "Add clean kernel header for uhid." into jb-mr1-dev
...
* commit '09d9dd3acdf74630eb7eb6896007e803085f45c6':
Add clean kernel header for uhid.
2012-08-16 12:05:44 -07:00
Scott Anderson
09d9dd3acd
Merge "Add clean kernel header for uhid." into jb-mr1-dev
2012-08-16 12:03:25 -07:00
Scott Anderson
52bf2d5659
Add clean kernel header for uhid.
...
The original kernel header was submitted in this change:
commit 45b515c106161bb3b00d2c097504b9d44505f2d9
Author: Scott Anderson <saa@android.com>
Date: Wed Aug 15 14:52:27 2012 -0700
Add uhid original header.
This header was cherry-picked from the upstream series that ends
with patch adefb69b1b94df29ea2df05cd838c0e032b2c473.
Change-Id: If516e41b6b14754e7feebdf062461dd38a31900a
Signed-off-by: Scott Anderson <saa@android.com>
Change-Id: I088a0df4449df859835f8267d0d2e6cd4ed3c478
Signed-off-by: Scott Anderson <saa@android.com>
2012-08-16 11:56:11 -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
Elliott Hughes
26145cfc18
am 949d6faa
: am a626bbdb
: am 4af9141c
: am ae728099
: Merge "enable clone system call for x86"
...
* commit '949d6faa96e25170293d2a9ebe6f76cc91b77a6e':
enable clone system call for x86
2012-08-15 17:26:44 -07:00
Elliott Hughes
949d6faa96
am a626bbdb
: am 4af9141c
: am ae728099
: Merge "enable clone system call for x86"
...
* commit 'a626bbdb361539d6667932027ea9ffa26ef1faf4':
enable clone system call for x86
2012-08-15 17:25:35 -07:00
Elliott Hughes
a626bbdb36
am 4af9141c
: am ae728099
: Merge "enable clone system call for x86"
...
* commit '4af9141c5cc0989df6a1efcb10b2cfd484f2d9d2':
enable clone system call for x86
2012-08-15 17:24:21 -07:00
Elliott Hughes
4af9141c5c
am ae728099
: Merge "enable clone system call for x86"
...
* commit 'ae7280994e7845037b667fd6ebdcb6f299ba1aab':
enable clone system call for x86
2012-08-15 17:22:50 -07:00
Elliott Hughes
1d16b89289
am 31041a01
: am 29af938c
: am ab8850f7
: am 07cd1125
: Merge "Fix comment typos."
...
* commit '31041a0138d62879257d6980abd1e006c299752b':
Fix comment typos.
2012-08-15 17:11:48 -07:00
Elliott Hughes
b8d2695c82
am cdbd3406
: am 4d63f33c
: am 76aad1d2
: am e1cd69a7
: Merge "Regenerate all NOTICE files with the latest version of the script."
...
* commit 'cdbd3406f51d7f21326fe99df21e48a9191dddc1':
Regenerate all NOTICE files with the latest version of the script.
2012-08-15 17:11:47 -07:00
Elliott Hughes
31041a0138
am 29af938c
: am ab8850f7
: am 07cd1125
: Merge "Fix comment typos."
...
* commit '29af938cbd9b898c92f44c022dc7f5d3ab9782a7':
Fix comment typos.
2012-08-15 17:09:39 -07:00
Elliott Hughes
cdbd3406f5
am 4d63f33c
: am 76aad1d2
: am e1cd69a7
: Merge "Regenerate all NOTICE files with the latest version of the script."
...
* commit '4d63f33cdc74c340c13b96143833f669835764f2':
Regenerate all NOTICE files with the latest version of the script.
2012-08-15 17:09:38 -07:00
Elliott Hughes
29af938cbd
am ab8850f7
: am 07cd1125
: Merge "Fix comment typos."
...
* commit 'ab8850f7e2b79914af4cf83816e9a263b9e6dec3':
Fix comment typos.
2012-08-15 17:08:01 -07:00
Elliott Hughes
4d63f33cdc
am 76aad1d2
: am e1cd69a7
: Merge "Regenerate all NOTICE files with the latest version of the script."
...
* commit '76aad1d2746f62aaaacdf717b4f51fa45560521d':
Regenerate all NOTICE files with the latest version of the script.
2012-08-15 17:07:59 -07:00
Elliott Hughes
ab8850f7e2
am 07cd1125
: Merge "Fix comment typos."
...
* commit '07cd11251f52ff8a8a98dba795f69aaa75199473':
Fix comment typos.
2012-08-15 17:06:53 -07:00
Elliott Hughes
76aad1d274
am e1cd69a7
: Merge "Regenerate all NOTICE files with the latest version of the script."
...
* commit 'e1cd69a708d30fbc3b9e0e8d4db67f67fc123b65':
Regenerate all NOTICE files with the latest version of the script.
2012-08-15 17:06:51 -07:00
Elliott Hughes
ae7280994e
Merge "enable clone system call for x86"
2012-08-15 17:05:47 -07:00
Jin Wei
22d366cc09
enable clone system call for x86
...
Add __bionic_clone function for x86, which will be
used for clone system call.
Change-Id: I889dc9bf4b7ebb4358476e17e6f3233e26491f4d
Signed-off-by: Jin Wei <wei.a.jin@intel.com>
Signed-off-by: Xiaokang Qin <xiaokang.qin@intel.com>
Signed-off-by: Beare, Bruce J <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 51414
2012-08-15 17:04:50 -07:00
Elliott Hughes
07cd11251f
Merge "Fix comment typos."
2012-08-15 16:59:21 -07:00
Elliott Hughes
105bc26fa6
Fix comment typos.
...
Change-Id: I8feeec1ee9935a6d6baebe57f1c0043ff90ff94f
2012-08-15 16:56:00 -07:00
Elliott Hughes
e1cd69a708
Merge "Regenerate all NOTICE files with the latest version of the script."
2012-08-15 16:51:56 -07:00
Elliott Hughes
0681b2e477
am f53c75e5
: am 2e3756b4
: am 9b3bbcda
: am fe43c768
: Merge "Switch to the current NetBSD regex implementation."
...
* commit 'f53c75e513cb088d712badc32b89a8792a329d63':
Switch to the current NetBSD regex implementation.
2012-08-15 16:03:03 -07:00
Elliott Hughes
f53c75e513
am 2e3756b4
: am 9b3bbcda
: am fe43c768
: Merge "Switch to the current NetBSD regex implementation."
...
* commit '2e3756b4d36c9b7f6a892b87757d41b3201b9773':
Switch to the current NetBSD regex implementation.
2012-08-15 16:01:22 -07:00
Elliott Hughes
2e3756b4d3
am 9b3bbcda
: am fe43c768
: Merge "Switch to the current NetBSD regex implementation."
...
* commit '9b3bbcda8478a31fa2c3865e0bd8cb3011dfc26e':
Switch to the current NetBSD regex implementation.
2012-08-15 15:59:44 -07:00
Elliott Hughes
9b3bbcda84
am fe43c768
: Merge "Switch to the current NetBSD regex implementation."
...
* commit 'fe43c768ec803a1febde0424bb5e69c343dd7ae9':
Switch to the current NetBSD regex implementation.
2012-08-15 15:58:39 -07:00
Elliott Hughes
32dbc03c73
Regenerate all NOTICE files with the latest version of the script.
...
This sorts every entry, so we should have more stability and fewer
merge conflicts in future.
Change-Id: Ifc5347dc53352da22c82d41ca59b483966fcfc6b
2012-08-15 15:43:13 -07:00
Elliott Hughes
fe43c768ec
Merge "Switch to the current NetBSD regex implementation."
2012-08-15 15:39:49 -07:00
Elliott Hughes
cc213f871b
Switch to the current NetBSD regex implementation.
...
Change-Id: If32b28dd85d6a7ab8957ab81d19fa4c0de9499d5
2012-08-15 15:39:11 -07:00
The Android Open Source Project
c05ca5f058
am e24cde44
: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit 'e24cde4406792ee57f5dbfaa1efc35131f289063':
2012-08-15 08:29:17 -07:00
The Android Open Source Project
e24cde4406
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I2f6d32a6bc10f17d85930b21c2ac55c91d5e252e
2012-08-15 08:26:11 -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
Elliott Hughes
cc9f4d56c0
am ff45d5cd
: am 82259117
: am 008a0a5d
: am 53493a9b
: Merge "Sort NOTICE entries."
...
* commit 'ff45d5cdbfc4117d69fc688f12ec251297eb8751':
Sort NOTICE entries.
2012-08-14 15:47:31 -07:00
Elliott Hughes
ff45d5cdbf
am 82259117
: am 008a0a5d
: am 53493a9b
: Merge "Sort NOTICE entries."
...
* commit '82259117753adffdab3ce74efb12d30a5289ad2b':
Sort NOTICE entries.
2012-08-14 15:46:26 -07:00
Elliott Hughes
8225911775
am 008a0a5d
: am 53493a9b
: Merge "Sort NOTICE entries."
...
* commit '008a0a5d50965f73d5954607a0b17b95a7f1fd0e':
Sort NOTICE entries.
2012-08-14 15:43:57 -07:00
Iliyan Malchev
422bb8b5c4
am 912dd712
: am df88d88f
: Merge changes I2e8af44e,Ie9250a0e into jb-mr1-dev
...
* commit '912dd71259959a259478465296438e83d0ad8e64':
update msm_mdp.h header to support vsync
update processed msm_camera.h and msm_isp.h
2012-08-14 15:43:18 -07:00
Elliott Hughes
008a0a5d50
am 53493a9b
: Merge "Sort NOTICE entries."
...
* commit '53493a9b26e9fb665de590abf3502af94eaf3f44':
Sort NOTICE entries.
2012-08-14 15:42:36 -07:00
Iliyan Malchev
912dd71259
am df88d88f
: Merge changes I2e8af44e,Ie9250a0e into jb-mr1-dev
...
* commit 'df88d88f56f37cdf75ab03c6b68a42010d9ac6c7':
update msm_mdp.h header to support vsync
update processed msm_camera.h and msm_isp.h
2012-08-14 15:41:38 -07:00
Iliyan Malchev
df88d88f56
Merge changes I2e8af44e,Ie9250a0e into jb-mr1-dev
...
* changes:
update msm_mdp.h header to support vsync
update processed msm_camera.h and msm_isp.h
2012-08-14 15:40:21 -07:00
Elliott Hughes
53493a9b26
Merge "Sort NOTICE entries."
2012-08-14 15:31:18 -07:00