OSDN Git Service
Jean-Baptiste Queru [Wed, 22 Aug 2012 14:33:51 +0000 (07:33 -0700)]
am
e49df020: am
170ad354: am
c7de0225: Merge "Use unambiguous mnemonics"
* commit '
e49df0203c112bf44b166cde733554072b115ec5':
Use unambiguous mnemonics
Jean-Baptiste Queru [Wed, 22 Aug 2012 14:32:21 +0000 (07:32 -0700)]
am
170ad354: am
c7de0225: Merge "Use unambiguous mnemonics"
* commit '
170ad35419620b428c15a8945416ce8cedef3e81':
Use unambiguous mnemonics
Jean-Baptiste Queru [Wed, 22 Aug 2012 14:30:56 +0000 (07:30 -0700)]
am
c7de0225: Merge "Use unambiguous mnemonics"
* commit '
c7de02259052b1eeebbfd3a0c21acf56a7e84357':
Use unambiguous mnemonics
Jean-Baptiste Queru [Wed, 22 Aug 2012 14:18:49 +0000 (07:18 -0700)]
Merge "Use unambiguous mnemonics"
Erik Gilling [Wed, 22 Aug 2012 02:11:07 +0000 (19:11 -0700)]
am
974e16cd: update linux/sync.h
* commit '
974e16cd829b6f75a5861759e86c1c09768272f2':
update linux/sync.h
Erik Gilling [Wed, 22 Aug 2012 01:17:24 +0000 (18:17 -0700)]
update linux/sync.h
Change-Id: Ic2133976b675cdcd3ca88f4845180a7ff1c79e34
Signed-off-by: Erik Gilling <konkers@android.com>
The Android Open Source Project [Tue, 21 Aug 2012 23:04:39 +0000 (16:04 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I559e0ba590f5beee87871ecfbdfc185566d40f9f
Kevin Schoedel [Fri, 29 Jun 2012 13:23:47 +0000 (09:23 -0400)]
Use unambiguous mnemonics
Change-Id: I8da0af54cc3cbf69d9e485eb71bc44a6976b1adc
Author: Kevin P Schoedel <kevin.p.schoedel@intel.com>
Reviewed-by: Edwin Vane <edwin.vane@intel.com>
The Android Automerger [Tue, 21 Aug 2012 13:33:32 +0000 (06:33 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Andrew Hsieh [Tue, 21 Aug 2012 10:33:02 +0000 (03:33 -0700)]
am
f861705f: am
5cd1efb2: am
1bd035cf: Merge "Enclosed functions in fenv.h with __BEGIN_DECLS/__END_DECLS"
* commit '
f861705f8c64af968b542c23932994cd17bb5db9':
Enclosed functions in fenv.h with __BEGIN_DECLS/__END_DECLS
Andrew Hsieh [Tue, 21 Aug 2012 10:31:02 +0000 (03:31 -0700)]
am
5cd1efb2: am
1bd035cf: Merge "Enclosed functions in fenv.h with __BEGIN_DECLS/__END_DECLS"
* commit '
5cd1efb2ba68cdde13682ee37a3499b7bd974bdb':
Enclosed functions in fenv.h with __BEGIN_DECLS/__END_DECLS
Andrew Hsieh [Tue, 21 Aug 2012 10:29:14 +0000 (03:29 -0700)]
am
1bd035cf: Merge "Enclosed functions in fenv.h with __BEGIN_DECLS/__END_DECLS"
* commit '
1bd035cf119a2e4a667f07907c7860e5ec223cee':
Enclosed functions in fenv.h with __BEGIN_DECLS/__END_DECLS
Andrew Hsieh [Tue, 21 Aug 2012 10:25:45 +0000 (03:25 -0700)]
Merge "Enclosed functions in fenv.h with __BEGIN_DECLS/__END_DECLS"
Andrew Hsieh [Tue, 21 Aug 2012 07:41:34 +0000 (15:41 +0800)]
Enclosed functions in fenv.h with __BEGIN_DECLS/__END_DECLS
Those are C funcitons
Related CL: https://android-review.googlesource.com/#/c/41833/
Change-Id: I4386bcf948ad31c3690c9b7a145103088133d041
Ian Rogers [Tue, 21 Aug 2012 02:46:25 +0000 (19:46 -0700)]
am
4ac3b0a1: am
8af726b2: am
7b0d9b79: Merge "Restore posix_memalign"
* commit '
4ac3b0a1487cc97e86bd98959e23bf2303942945':
Restore posix_memalign
Ian Rogers [Tue, 21 Aug 2012 02:45:12 +0000 (19:45 -0700)]
am
8af726b2: am
7b0d9b79: Merge "Restore posix_memalign"
* commit '
8af726b24fbb9ab545719bd3980a4f0ad9bcb8a8':
Restore posix_memalign
Ian Rogers [Tue, 21 Aug 2012 02:43:15 +0000 (19:43 -0700)]
am
7b0d9b79: Merge "Restore posix_memalign"
* commit '
7b0d9b798474ab62d4bf67c79ae901f4c4789f27':
Restore posix_memalign
Ian Rogers [Tue, 21 Aug 2012 02:35:25 +0000 (19:35 -0700)]
Merge "Restore posix_memalign"
Brian Carlstrom [Tue, 21 Aug 2012 01:28:20 +0000 (18:28 -0700)]
Restore posix_memalign
Change-Id: I24e31bcb8b1d8be9375852e76964f09becd11938
Brian Carlstrom [Tue, 21 Aug 2012 01:36:44 +0000 (18:36 -0700)]
am
cc1f4acb: Restore posix_memalign
* commit '
cc1f4acbda8f12c2020c2e5f1f8a03221c9ae4e9':
Restore posix_memalign
Brian Carlstrom [Tue, 21 Aug 2012 01:28:20 +0000 (18:28 -0700)]
Restore posix_memalign
Change-Id: I24e31bcb8b1d8be9375852e76964f09becd11938
Brian Carlstrom [Mon, 20 Aug 2012 23:34:22 +0000 (16:34 -0700)]
am
76f60e2e: am
fe87596a: am
c37dcd3d: Merge "Upgrade to dlmalloc 2.8.5."
* commit '
76f60e2ebd8750c4e4594158745e752b6a10ea0b':
Upgrade to dlmalloc 2.8.5.
Brian Carlstrom [Mon, 20 Aug 2012 23:31:29 +0000 (16:31 -0700)]
am
fe87596a: am
c37dcd3d: Merge "Upgrade to dlmalloc 2.8.5."
* commit '
fe87596a5ba5a5b0773b2854f9fce85f49367611':
Upgrade to dlmalloc 2.8.5.
Brian Carlstrom [Mon, 20 Aug 2012 23:29:48 +0000 (16:29 -0700)]
am
c37dcd3d: Merge "Upgrade to dlmalloc 2.8.5."
* commit '
c37dcd3d3ab8e32c37ce034b8d1772b4a7b9add9':
Upgrade to dlmalloc 2.8.5.
Brian Carlstrom [Mon, 20 Aug 2012 23:12:32 +0000 (16:12 -0700)]
Merge "Upgrade to dlmalloc 2.8.5."
Ian Rogers [Sat, 18 Aug 2012 00:28:15 +0000 (17:28 -0700)]
Upgrade to dlmalloc 2.8.5.
Move dlmalloc code to upstream-dlmalloc to make pulling upstream changes
easier.
Declare pvalloc and malloc_usable_size routines present in malloc.h but with
missing implementations. Remove other functions from malloc.h that have
no implementation nor use in Android.
Change-Id: Ia6472ec6cbebc9ad1ef99f4669de9d33fcc2efb4
The Android Automerger [Mon, 20 Aug 2012 13:33:38 +0000 (06:33 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Elliott Hughes [Sat, 18 Aug 2012 00:00:03 +0000 (17:00 -0700)]
am
dd0e991c: am
2651d6c6: am
9417a80e: Merge "Always define the 64-bit int types."
* commit '
dd0e991c6a0d4d71f1698fd57608a7d42401b6da':
Always define the 64-bit int types.
Elliott Hughes [Fri, 17 Aug 2012 23:58:10 +0000 (16:58 -0700)]
am
2651d6c6: am
9417a80e: Merge "Always define the 64-bit int types."
* commit '
2651d6c6cbd0fafff83aafb61ab7bc9cbab413d2':
Always define the 64-bit int types.
Elliott Hughes [Fri, 17 Aug 2012 23:56:14 +0000 (16:56 -0700)]
am
9417a80e: Merge "Always define the 64-bit int types."
* commit '
9417a80e48d3bba4bea814178aaa79b905ebab8c':
Always define the 64-bit int types.
Elliott Hughes [Fri, 17 Aug 2012 23:48:14 +0000 (16:48 -0700)]
Merge "Always define the 64-bit int types."
Elliott Hughes [Fri, 17 Aug 2012 23:28:00 +0000 (16:28 -0700)]
am
db2903fa: am
cbeccc84: am
200de748: Merge "Fix race condition in pthread_create()"
* commit '
db2903fac3d4548de1fd0fda1d3b7460c723282e':
Fix race condition in pthread_create()
Elliott Hughes [Fri, 17 Aug 2012 23:26:37 +0000 (16:26 -0700)]
am
cbeccc84: am
200de748: Merge "Fix race condition in pthread_create()"
* commit '
cbeccc849a45ac9adc124a6d1781c1ddc7bad54e':
Fix race condition in pthread_create()
Elliott Hughes [Fri, 17 Aug 2012 23:23:53 +0000 (16:23 -0700)]
am
200de748: Merge "Fix race condition in pthread_create()"
* commit '
200de748b91d7638a2c434584abcb3840704494b':
Fix race condition in pthread_create()
Elliott Hughes [Fri, 17 Aug 2012 23:19:56 +0000 (16:19 -0700)]
Merge "Fix race condition in pthread_create()"
Jurijs Oniscuks [Thu, 5 Jul 2012 12:57:38 +0000 (14:57 +0200)]
Fix race condition in pthread_create()
Save thread id to *thread_out before new
thread is allowed to run else there's a
risk that the thread has finished and
been deleted when *thread_out is assigned.
Change-Id: I6b84c61a8df06840877d4ab036f26feace3192d8
Elliott Hughes [Fri, 17 Aug 2012 21:30:06 +0000 (14:30 -0700)]
Always define the 64-bit int types.
These preprocessor tricks have caused trouble for -std=gnu99 and -ansi, and
both netbsd's libc and glibc seem to unconditionally define these types.
Change-Id: Ib8dffa341a8ca88f80d275ba2b7f93a4c910ee32
Elliott Hughes [Fri, 17 Aug 2012 21:03:53 +0000 (14:03 -0700)]
am
efd39834: am
e5242bfd: am
1771a33d: Merge "Add link.h for all platforms with dl_phdr_info"
* commit '
efd3983446c6574c9662b01f441776cf299c0c80':
Add link.h for all platforms with dl_phdr_info
Elliott Hughes [Fri, 17 Aug 2012 21:01:53 +0000 (14:01 -0700)]
am
e5242bfd: am
1771a33d: Merge "Add link.h for all platforms with dl_phdr_info"
* commit '
e5242bfdd731a67282389ece515f094d57bb7300':
Add link.h for all platforms with dl_phdr_info
Elliott Hughes [Fri, 17 Aug 2012 21:00:11 +0000 (14:00 -0700)]
am
1771a33d: Merge "Add link.h for all platforms with dl_phdr_info"
* commit '
1771a33d11a24f1c47b1ef75e3726c5d9e751f5b':
Add link.h for all platforms with dl_phdr_info
Elliott Hughes [Fri, 17 Aug 2012 20:54:43 +0000 (13:54 -0700)]
Merge "Add link.h for all platforms with dl_phdr_info"
Pavel Chupin [Fri, 17 Aug 2012 08:53:29 +0000 (12:53 +0400)]
Add link.h for all platforms with dl_phdr_info
This header is used on bionic build and should be propagated into
sysroot on toolchain rebuild. Discussion re. this header is here:
http://gcc.gnu.org/ml/gcc-patches/2012-08/msg00936.html
It is available already in mips NDK platforms:
development/ndk/platforms/android-9/arch-mips/include/link.h
Change-Id: I39ff467cdac9f448e31c11ee3e14a6200e82ab57
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
Joe Onorato [Fri, 17 Aug 2012 07:14:21 +0000 (00:14 -0700)]
am
28ae6f5d: am
cefb93b6: am
6c98cdb1: Merge "Don\'t over-generalize makefiles. Host modules always build. This isn\'t needed on eng builds."
* commit '
28ae6f5dfd024dd3f860b134ebed56a0248a1097':
Don't over-generalize makefiles. Host modules always build. This isn't needed on eng builds.
Joe Onorato [Fri, 17 Aug 2012 07:11:56 +0000 (00:11 -0700)]
am
cefb93b6: am
6c98cdb1: Merge "Don\'t over-generalize makefiles. Host modules always build. This isn\'t needed on eng builds."
* commit '
cefb93b632fc5a65bf7620095155cc1c314e29f2':
Don't over-generalize makefiles. Host modules always build. This isn't needed on eng builds.
Joe Onorato [Fri, 17 Aug 2012 06:50:35 +0000 (23:50 -0700)]
am
6c98cdb1: Merge "Don\'t over-generalize makefiles. Host modules always build. This isn\'t needed on eng builds."
* commit '
6c98cdb1924afd3e71d39904557933fa10adaebf':
Don't over-generalize makefiles. Host modules always build. This isn't needed on eng builds.
Joe Onorato [Fri, 17 Aug 2012 06:37:49 +0000 (23:37 -0700)]
Merge "Don't over-generalize makefiles. Host modules always build. This isn't needed on eng builds."
Joe Onorato [Thu, 16 Aug 2012 03:27:04 +0000 (20:27 -0700)]
Don't over-generalize makefiles. Host modules always build. This isn't needed on eng builds.
Change-Id: I5821ced7a8a9042fd2094204e07470d8002263ca
The Android Open Source Project [Fri, 17 Aug 2012 02:09:40 +0000 (19:09 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I56a0568d05e01d6ca908c97af3036ffe5a057df0
Elliott Hughes [Fri, 17 Aug 2012 00:07:18 +0000 (17:07 -0700)]
am
a7d8f3d5: am
c80ca54f: am
60ef95e1: Merge "Enhance getcwd(3) to handle NULL like glibc."
* commit '
a7d8f3d50e6b0858b3b6494d772167286cdeb986':
Enhance getcwd(3) to handle NULL like glibc.
Elliott Hughes [Fri, 17 Aug 2012 00:05:40 +0000 (17:05 -0700)]
am
c80ca54f: am
60ef95e1: Merge "Enhance getcwd(3) to handle NULL like glibc."
* commit '
c80ca54f3cd2d7e20770e286f4478fb589742478':
Enhance getcwd(3) to handle NULL like glibc.
Elliott Hughes [Fri, 17 Aug 2012 00:04:11 +0000 (17:04 -0700)]
am
60ef95e1: Merge "Enhance getcwd(3) to handle NULL like glibc."
* commit '
60ef95e1c1b171635adb4d11289347674b1b8987':
Enhance getcwd(3) to handle NULL like glibc.
Elliott Hughes [Thu, 16 Aug 2012 23:58:34 +0000 (16:58 -0700)]
Merge "Enhance getcwd(3) to handle NULL like glibc."
Elliott Hughes [Thu, 16 Aug 2012 22:59:12 +0000 (15:59 -0700)]
Enhance getcwd(3) to handle NULL like glibc.
Bug: http://code.google.com/p/android/issues/detail?id=36085
Change-Id: I960a1b585887eb66176c61d29c5c61c239a4003f
Elliott Hughes [Thu, 16 Aug 2012 21:27:28 +0000 (14:27 -0700)]
am
820ad428: am
74438bb2: am
449d4634: Merge "bionic: add macro protection for MALLOC_ALIGNMENT"
* commit '
820ad4283d71c4f2303f80d8ccbe6c90a6ec5407':
bionic: add macro protection for MALLOC_ALIGNMENT
Elliott Hughes [Thu, 16 Aug 2012 21:23:56 +0000 (14:23 -0700)]
am
74438bb2: am
449d4634: Merge "bionic: add macro protection for MALLOC_ALIGNMENT"
* commit '
74438bb22505b55ec72224932ae9982fbf9b4b65':
bionic: add macro protection for MALLOC_ALIGNMENT
Elliott Hughes [Thu, 16 Aug 2012 19:27:47 +0000 (12:27 -0700)]
am
449d4634: Merge "bionic: add macro protection for MALLOC_ALIGNMENT"
* commit '
449d4634bea0ff8f6b29a2826871279dd654f941':
bionic: add macro protection for MALLOC_ALIGNMENT
Elliott Hughes [Thu, 16 Aug 2012 19:09:13 +0000 (12:09 -0700)]
Merge "bionic: add macro protection for MALLOC_ALIGNMENT"
Jin Wei [Wed, 1 Aug 2012 06:48:57 +0000 (14:48 +0800)]
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>
Scott Anderson [Thu, 16 Aug 2012 19:05:44 +0000 (12:05 -0700)]
am
09d9dd3a: Merge "Add clean kernel header for uhid." into jb-mr1-dev
* commit '
09d9dd3acdf74630eb7eb6896007e803085f45c6':
Add clean kernel header for uhid.
Scott Anderson [Thu, 16 Aug 2012 19:03:24 +0000 (12:03 -0700)]
Merge "Add clean kernel header for uhid." into jb-mr1-dev
Scott Anderson [Wed, 15 Aug 2012 21:51:12 +0000 (14:51 -0700)]
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>
The Android Automerger [Thu, 16 Aug 2012 13:33:16 +0000 (06:33 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Elliott Hughes [Thu, 16 Aug 2012 00:25:35 +0000 (17:25 -0700)]
am
a626bbdb: am
4af9141c: am
ae728099: Merge "enable clone system call for x86"
* commit '
a626bbdb361539d6667932027ea9ffa26ef1faf4':
enable clone system call for x86
Elliott Hughes [Thu, 16 Aug 2012 00:24:21 +0000 (17:24 -0700)]
am
4af9141c: am
ae728099: Merge "enable clone system call for x86"
* commit '
4af9141c5cc0989df6a1efcb10b2cfd484f2d9d2':
enable clone system call for x86
Elliott Hughes [Thu, 16 Aug 2012 00:22:50 +0000 (17:22 -0700)]
am
ae728099: Merge "enable clone system call for x86"
* commit '
ae7280994e7845037b667fd6ebdcb6f299ba1aab':
enable clone system call for x86
Elliott Hughes [Thu, 16 Aug 2012 00:09:39 +0000 (17:09 -0700)]
am
29af938c: am
ab8850f7: am
07cd1125: Merge "Fix comment typos."
* commit '
29af938cbd9b898c92f44c022dc7f5d3ab9782a7':
Fix comment typos.
Elliott Hughes [Thu, 16 Aug 2012 00:09:38 +0000 (17:09 -0700)]
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.
Elliott Hughes [Thu, 16 Aug 2012 00:08:01 +0000 (17:08 -0700)]
am
ab8850f7: am
07cd1125: Merge "Fix comment typos."
* commit '
ab8850f7e2b79914af4cf83816e9a263b9e6dec3':
Fix comment typos.
Elliott Hughes [Thu, 16 Aug 2012 00:07:59 +0000 (17:07 -0700)]
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.
Elliott Hughes [Thu, 16 Aug 2012 00:06:53 +0000 (17:06 -0700)]
am
07cd1125: Merge "Fix comment typos."
* commit '
07cd11251f52ff8a8a98dba795f69aaa75199473':
Fix comment typos.
Elliott Hughes [Thu, 16 Aug 2012 00:06:51 +0000 (17:06 -0700)]
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.
Elliott Hughes [Thu, 16 Aug 2012 00:05:47 +0000 (17:05 -0700)]
Merge "enable clone system call for x86"
Jin Wei [Wed, 8 Aug 2012 07:15:16 +0000 (15:15 +0800)]
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
Elliott Hughes [Wed, 15 Aug 2012 23:59:21 +0000 (16:59 -0700)]
Merge "Fix comment typos."
Elliott Hughes [Wed, 15 Aug 2012 23:56:00 +0000 (16:56 -0700)]
Fix comment typos.
Change-Id: I8feeec1ee9935a6d6baebe57f1c0043ff90ff94f
Elliott Hughes [Wed, 15 Aug 2012 23:51:56 +0000 (16:51 -0700)]
Merge "Regenerate all NOTICE files with the latest version of the script."
Elliott Hughes [Wed, 15 Aug 2012 23:01:22 +0000 (16:01 -0700)]
am
2e3756b4: am
9b3bbcda: am
fe43c768: Merge "Switch to the current NetBSD regex implementation."
* commit '
2e3756b4d36c9b7f6a892b87757d41b3201b9773':
Switch to the current NetBSD regex implementation.
Elliott Hughes [Wed, 15 Aug 2012 22:59:44 +0000 (15:59 -0700)]
am
9b3bbcda: am
fe43c768: Merge "Switch to the current NetBSD regex implementation."
* commit '
9b3bbcda8478a31fa2c3865e0bd8cb3011dfc26e':
Switch to the current NetBSD regex implementation.
Elliott Hughes [Wed, 15 Aug 2012 22:58:39 +0000 (15:58 -0700)]
am
fe43c768: Merge "Switch to the current NetBSD regex implementation."
* commit '
fe43c768ec803a1febde0424bb5e69c343dd7ae9':
Switch to the current NetBSD regex implementation.
Elliott Hughes [Wed, 15 Aug 2012 22:43:13 +0000 (15:43 -0700)]
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
Elliott Hughes [Wed, 15 Aug 2012 22:39:49 +0000 (15:39 -0700)]
Merge "Switch to the current NetBSD regex implementation."
Elliott Hughes [Tue, 14 Aug 2012 22:32:42 +0000 (15:32 -0700)]
Switch to the current NetBSD regex implementation.
Change-Id: If32b28dd85d6a7ab8957ab81d19fa4c0de9499d5
The Android Open Source Project [Wed, 15 Aug 2012 15:26:11 +0000 (08:26 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I2f6d32a6bc10f17d85930b21c2ac55c91d5e252e
The Android Automerger [Wed, 15 Aug 2012 13:33:26 +0000 (06:33 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Elliott Hughes [Tue, 14 Aug 2012 22:46:26 +0000 (15:46 -0700)]
am
82259117: am
008a0a5d: am
53493a9b: Merge "Sort NOTICE entries."
* commit '
82259117753adffdab3ce74efb12d30a5289ad2b':
Sort NOTICE entries.
Elliott Hughes [Tue, 14 Aug 2012 22:43:57 +0000 (15:43 -0700)]
am
008a0a5d: am
53493a9b: Merge "Sort NOTICE entries."
* commit '
008a0a5d50965f73d5954607a0b17b95a7f1fd0e':
Sort NOTICE entries.
Elliott Hughes [Tue, 14 Aug 2012 22:42:36 +0000 (15:42 -0700)]
am
53493a9b: Merge "Sort NOTICE entries."
* commit '
53493a9b26e9fb665de590abf3502af94eaf3f44':
Sort NOTICE entries.
Iliyan Malchev [Tue, 14 Aug 2012 22:41:38 +0000 (15:41 -0700)]
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
Iliyan Malchev [Tue, 14 Aug 2012 22:40:21 +0000 (15:40 -0700)]
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
Elliott Hughes [Tue, 14 Aug 2012 22:31:17 +0000 (15:31 -0700)]
Merge "Sort NOTICE entries."
Elliott Hughes [Tue, 14 Aug 2012 22:13:10 +0000 (15:13 -0700)]
Elliott Hughes [Tue, 14 Aug 2012 22:10:51 +0000 (15:10 -0700)]
am
63696738: am
b6a97196: Merge "More cleanup."
* commit '
63696738e5d0684fb1e769c541fba2e552c5110a':
More cleanup.
Elliott Hughes [Tue, 14 Aug 2012 22:08:38 +0000 (15:08 -0700)]
am
b6a97196: Merge "More cleanup."
* commit '
b6a971962acdf2684fd98658ec6fe6aa9952d84b':
More cleanup.
Elliott Hughes [Tue, 14 Aug 2012 22:04:05 +0000 (15:04 -0700)]
Sort NOTICE entries.
Also make sure we get the whole of any copyright header, in case
there's text before the "Copyright" line.
Change-Id: Iabcc5e0931a39c0107b833539fec7c5a3d134592
Elliott Hughes [Tue, 14 Aug 2012 22:02:40 +0000 (15:02 -0700)]
Merge "More cleanup."
Elliott Hughes [Tue, 14 Aug 2012 21:07:59 +0000 (14:07 -0700)]
More cleanup.
Make more stuff static, remove some dead code, and fix a few typos.
Change-Id: I010b0eadeaf61e2899c37014ad1e7082c70bd510
Naseer Ahmed [Wed, 1 Aug 2012 00:26:00 +0000 (17:26 -0700)]
update msm_mdp.h header to support vsync
Change-Id: I2e8af44e430ff4955615d166bd25d7a2102ccc0f
Ajay Dudani [Thu, 9 Aug 2012 16:58:59 +0000 (09:58 -0700)]
update processed msm_camera.h and msm_isp.h
Change-Id: Ie9250a0ef888a2d1ba0b736b19fede369daeef84
Elliott Hughes [Tue, 14 Aug 2012 19:31:15 +0000 (12:31 -0700)]
am
89a35435: am
16a0cbaa: am
b7c6991c: Merge "Update MS_ mount flags, define unshare() syscall."
* commit '
89a3543568ffedb54473f961f36f17d211d9c7e1':
Update MS_ mount flags, define unshare() syscall.
Elliott Hughes [Tue, 14 Aug 2012 19:29:01 +0000 (12:29 -0700)]
am
16a0cbaa: am
b7c6991c: Merge "Update MS_ mount flags, define unshare() syscall."
* commit '
16a0cbaa83dc653a5b6a0fa62088f08cdfa4dedc':
Update MS_ mount flags, define unshare() syscall.
OSDN Git Service
