OSDN Git Service
Shih-wei Liao [Mon, 6 Aug 2012 17:23:24 +0000 (10:23 -0700)]
am
42bfbd1e: am
6ff66601: am
ce4a5cd5: am
8173d767: Merge "Revert "Fix the clang build: this compiler doesn\'t support the gnu_inline function attribute""
* commit '
42bfbd1e617b7430fd5c62cb9162ab5c79655e3d':
Revert "Fix the clang build: this compiler doesn't support the gnu_inline function attribute"
Shih-wei Liao [Mon, 6 Aug 2012 17:23:23 +0000 (10:23 -0700)]
am
ed33635d: am
cddedade: am
924fd920: am
601a49d3: Merge "When compiling with clang, don\'t "fortify_source" the strlen."
* commit '
ed33635da7d8cfc6f5c61c5d7ab9bc42ab5b3916':
When compiling with clang, don't "fortify_source" the strlen.
Shih-wei Liao [Mon, 6 Aug 2012 17:20:48 +0000 (10:20 -0700)]
am
6ff66601: am
ce4a5cd5: am
8173d767: Merge "Revert "Fix the clang build: this compiler doesn\'t support the gnu_inline function attribute""
* commit '
6ff66601a47d7b74544310e4a5535d572e23d68e':
Revert "Fix the clang build: this compiler doesn't support the gnu_inline function attribute"
Shih-wei Liao [Mon, 6 Aug 2012 17:20:47 +0000 (10:20 -0700)]
am
cddedade: am
924fd920: am
601a49d3: Merge "When compiling with clang, don\'t "fortify_source" the strlen."
* commit '
cddedade5b1138d5ddafe5b084923f21bba75526':
When compiling with clang, don't "fortify_source" the strlen.
Shih-wei Liao [Mon, 6 Aug 2012 17:18:21 +0000 (10:18 -0700)]
am
ce4a5cd5: am
8173d767: Merge "Revert "Fix the clang build: this compiler doesn\'t support the gnu_inline function attribute""
* commit '
ce4a5cd5f3ee09fbc8dea7ffdfcd4fd097f8ed34':
Revert "Fix the clang build: this compiler doesn't support the gnu_inline function attribute"
Shih-wei Liao [Mon, 6 Aug 2012 17:18:20 +0000 (10:18 -0700)]
am
924fd920: am
601a49d3: Merge "When compiling with clang, don\'t "fortify_source" the strlen."
* commit '
924fd920137135729483d0beacea20d5a0552c15':
When compiling with clang, don't "fortify_source" the strlen.
Shih-wei Liao [Mon, 6 Aug 2012 17:17:09 +0000 (10:17 -0700)]
am
8173d767: Merge "Revert "Fix the clang build: this compiler doesn\'t support the gnu_inline function attribute""
* commit '
8173d76740cafc2ceb49d2fddf1ceabfaa823236':
Revert "Fix the clang build: this compiler doesn't support the gnu_inline function attribute"
Shih-wei Liao [Mon, 6 Aug 2012 17:17:08 +0000 (10:17 -0700)]
am
601a49d3: Merge "When compiling with clang, don\'t "fortify_source" the strlen."
* commit '
601a49d39829005803670088da02179e61719551':
When compiling with clang, don't "fortify_source" the strlen.
Shih-wei Liao [Mon, 6 Aug 2012 17:05:14 +0000 (10:05 -0700)]
Merge "Revert "Fix the clang build: this compiler doesn't support the gnu_inline function attribute""
Shih-wei Liao [Mon, 6 Aug 2012 17:04:22 +0000 (10:04 -0700)]
Merge "When compiling with clang, don't "fortify_source" the strlen."
Shih-wei Liao [Mon, 6 Aug 2012 16:50:56 +0000 (09:50 -0700)]
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
Elliott Hughes [Mon, 6 Aug 2012 15:09:25 +0000 (08:09 -0700)]
am
a870ded2: am
eaac1e5a: am
94ce1356: am
7c92b6ca: Merge "Remove an awkward #include that is no longer upstream."
* commit '
a870ded21ac2e8b792ddc1fe1c5d71c421f0d8a1':
Remove an awkward #include that is no longer upstream.
Elliott Hughes [Mon, 6 Aug 2012 15:08:05 +0000 (08:08 -0700)]
am
eaac1e5a: am
94ce1356: am
7c92b6ca: Merge "Remove an awkward #include that is no longer upstream."
* commit '
eaac1e5a1c62a9dc9edd3a858a367bbb16194272':
Remove an awkward #include that is no longer upstream.
Elliott Hughes [Mon, 6 Aug 2012 15:06:27 +0000 (08:06 -0700)]
am
94ce1356: am
7c92b6ca: Merge "Remove an awkward #include that is no longer upstream."
* commit '
94ce135693a73ac09116dabc0f2440604bba5c87':
Remove an awkward #include that is no longer upstream.
Elliott Hughes [Mon, 6 Aug 2012 15:04:33 +0000 (08:04 -0700)]
am
7c92b6ca: Merge "Remove an awkward #include that is no longer upstream."
* commit '
7c92b6ca409f514e7ff67ac8c10d73ce92ff38d2':
Remove an awkward #include that is no longer upstream.
Elliott Hughes [Mon, 6 Aug 2012 14:57:59 +0000 (07:57 -0700)]
Merge "Remove an awkward #include that is no longer upstream."
Shih-wei Liao [Sat, 4 Aug 2012 00:44:08 +0000 (17:44 -0700)]
Revert "Fix the clang build: this compiler doesn't support the gnu_inline function attribute"
This reverts commit
4f1f149c3757c594f9ff987e5ddd919c3e7dba10.
Elliott Hughes [Fri, 3 Aug 2012 22:17:14 +0000 (15:17 -0700)]
am
8ccbc90a: am
4bac8f68: am
7e81ee04: am
1c861728: Merge "Remove yet more SH4 cruft."
* commit '
8ccbc90a3b6071dff015bff284b0a11d95a00349':
Remove yet more SH4 cruft.
Elliott Hughes [Fri, 3 Aug 2012 22:14:16 +0000 (15:14 -0700)]
am
4bac8f68: am
7e81ee04: am
1c861728: Merge "Remove yet more SH4 cruft."
* commit '
4bac8f689efd8f10850e60c52c206b20e4a90fd7':
Remove yet more SH4 cruft.
Elliott Hughes [Fri, 3 Aug 2012 22:12:39 +0000 (15:12 -0700)]
am
7e81ee04: am
1c861728: Merge "Remove yet more SH4 cruft."
* commit '
7e81ee04532e9c26f90d73061d9a53f09e2c3fa1':
Remove yet more SH4 cruft.
Elliott Hughes [Fri, 3 Aug 2012 22:09:55 +0000 (15:09 -0700)]
am
1c861728: Merge "Remove yet more SH4 cruft."
* commit '
1c861728e5c8dda7589e6595f4850d77ec21a236':
Remove yet more SH4 cruft.
Elliott Hughes [Fri, 3 Aug 2012 22:05:15 +0000 (15:05 -0700)]
Merge "Remove yet more SH4 cruft."
Elliott Hughes [Fri, 3 Aug 2012 21:58:18 +0000 (14:58 -0700)]
Remove yet more SH4 cruft.
Surely this is the last piece?
Change-Id: I4bd43afb102334ec34d0e14a65c2b319826473d7
Elliott Hughes [Fri, 3 Aug 2012 21:34:57 +0000 (14:34 -0700)]
am
9f8c7daf: am
c9dbebe3: am
f5385754: am
aea5f00d: Merge "bionic: modify syscall to use 6 registers to pass parameter."
* commit '
9f8c7daf402738beda56868692e62a90e095481d':
bionic: modify syscall to use 6 registers to pass parameter.
Elliott Hughes [Fri, 3 Aug 2012 21:33:20 +0000 (14:33 -0700)]
am
c9dbebe3: am
f5385754: am
aea5f00d: Merge "bionic: modify syscall to use 6 registers to pass parameter."
* commit '
c9dbebe344d2f6a4623a67d1c005bcb6137642c4':
bionic: modify syscall to use 6 registers to pass parameter.
Elliott Hughes [Fri, 3 Aug 2012 21:29:45 +0000 (14:29 -0700)]
am
f5385754: am
aea5f00d: Merge "bionic: modify syscall to use 6 registers to pass parameter."
* commit '
f5385754e29dcb093cb9445c40b69e45bd71d685':
bionic: modify syscall to use 6 registers to pass parameter.
Elliott Hughes [Fri, 3 Aug 2012 21:27:08 +0000 (14:27 -0700)]
am
aea5f00d: Merge "bionic: modify syscall to use 6 registers to pass parameter."
* commit '
aea5f00df4704a618331e16473b552e54bed269b':
bionic: modify syscall to use 6 registers to pass parameter.
Elliott Hughes [Fri, 3 Aug 2012 20:55:56 +0000 (13:55 -0700)]
Merge "bionic: modify syscall to use 6 registers to pass parameter."
Jin Wei [Thu, 12 Apr 2012 08:50:42 +0000 (16:50 +0800)]
bionic: modify syscall to use 6 registers to pass parameter.
Kernel allows to use 6 registers(exclude eax) to pass parameter.
But in syscall's implementation, it only uses five registers.
It will lead to error when 6 parameters passed.
Change-Id: I92d663194e6334c3847f0c0c257ca3b9dee0edef
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>
Author-tracking-BZ: 30838
Elliott Hughes [Fri, 3 Aug 2012 20:41:39 +0000 (13:41 -0700)]
am
58234e78: am
48955d24: am
c6f15ecf: am
1510795f: Merge "Upgrade to tzdata2012e."
* commit '
58234e788be30a16e6ba745adc21cbfd6d9828ec':
Upgrade to tzdata2012e.
Elliott Hughes [Fri, 3 Aug 2012 20:39:38 +0000 (13:39 -0700)]
am
48955d24: am
c6f15ecf: am
1510795f: Merge "Upgrade to tzdata2012e."
* commit '
48955d24b9f3e8c15028a6dbb54e2e96fd41780a':
Upgrade to tzdata2012e.
Elliott Hughes [Fri, 3 Aug 2012 20:33:15 +0000 (13:33 -0700)]
am
c6f15ecf: am
1510795f: Merge "Upgrade to tzdata2012e."
* commit '
c6f15ecf76842801db653d58a262c7d342be2a93':
Upgrade to tzdata2012e.
Elliott Hughes [Fri, 3 Aug 2012 20:30:44 +0000 (13:30 -0700)]
am
1510795f: Merge "Upgrade to tzdata2012e."
* commit '
1510795fec5aa8b8700a08200f37f6e57dea8d04':
Upgrade to tzdata2012e.
Elliott Hughes [Fri, 3 Aug 2012 19:30:18 +0000 (12:30 -0700)]
Merge "Upgrade to tzdata2012e."
Elliott Hughes [Fri, 3 Aug 2012 19:26:06 +0000 (12:26 -0700)]
Upgrade to tzdata2012e.
Includes this change:
* australasia (Pacific/Fakaofo): Tokelau is UTC+13, not UTC+14.
(Thanks to Steffen Thorsen.)
Change-Id: I51bfab759f424b90daeb1960c6cfb2b55b78ff46
David Turner [Fri, 3 Aug 2012 12:04:06 +0000 (05:04 -0700)]
am
c7813c08: am
d7552a31: am
2f2b7212: am
16d40217: Merge "Fix the clang build: this compiler doesn\'t support the gnu_inline function attribute"
* commit '
c7813c08570a5e6ef3e410973d7f4b4befebee77':
Fix the clang build: this compiler doesn't support the gnu_inline function attribute
David Turner [Fri, 3 Aug 2012 12:02:00 +0000 (05:02 -0700)]
am
d7552a31: am
2f2b7212: am
16d40217: Merge "Fix the clang build: this compiler doesn\'t support the gnu_inline function attribute"
* commit '
d7552a3101affbc531f3c33deca10c28417a864c':
Fix the clang build: this compiler doesn't support the gnu_inline function attribute
David Turner [Fri, 3 Aug 2012 12:00:03 +0000 (05:00 -0700)]
am
2f2b7212: am
16d40217: Merge "Fix the clang build: this compiler doesn\'t support the gnu_inline function attribute"
* commit '
2f2b72120489d9e7e67a97a059a731aa72a34f72':
Fix the clang build: this compiler doesn't support the gnu_inline function attribute
David Turner [Fri, 3 Aug 2012 11:57:56 +0000 (04:57 -0700)]
am
16d40217: Merge "Fix the clang build: this compiler doesn\'t support the gnu_inline function attribute"
* commit '
16d40217d05a1d9ad8ec475ce5f68c35bbef7029':
Fix the clang build: this compiler doesn't support the gnu_inline function attribute
David Turner [Fri, 3 Aug 2012 11:40:36 +0000 (04:40 -0700)]
Merge "Fix the clang build: this compiler doesn't support the gnu_inline function attribute"
Shih-wei Liao [Fri, 3 Aug 2012 11:20:06 +0000 (04:20 -0700)]
Fix the clang build: this compiler doesn't support the gnu_inline function attribute
Recent clang compiler doesn't have gnu_inline working. When frameworks/rs
is compiled with clang instead of gcc, it no longer works. Will be fixed
by this patch.
Change-Id: I8b281a1305151909e18958b73914ea27343cb4cd
Elliott Hughes [Fri, 3 Aug 2012 01:51:38 +0000 (18:51 -0700)]
am
df7aa950: am
9b6a4538: am
0ce92b96: am
1e304a3b: Merge "[MIPS] Support for TLS register"
* commit '
df7aa95031f5f99ba3fc95956c38bf7ffd037ab4':
[MIPS] Support for TLS register
Elliott Hughes [Fri, 3 Aug 2012 01:49:12 +0000 (18:49 -0700)]
am
9b6a4538: am
0ce92b96: am
1e304a3b: Merge "[MIPS] Support for TLS register"
* commit '
9b6a45386555a11aa1c7f473b21c480b4a158ea7':
[MIPS] Support for TLS register
Elliott Hughes [Fri, 3 Aug 2012 01:48:04 +0000 (18:48 -0700)]
am
0ce92b96: am
1e304a3b: Merge "[MIPS] Support for TLS register"
* commit '
0ce92b9625c5d0cc4e72047e6c8759c4cc079dcb':
[MIPS] Support for TLS register
Elliott Hughes [Fri, 3 Aug 2012 01:45:56 +0000 (18:45 -0700)]
am
1e304a3b: Merge "[MIPS] Support for TLS register"
* commit '
1e304a3bce347da08f0f9409829d911493bad1bb':
[MIPS] Support for TLS register
Elliott Hughes [Fri, 3 Aug 2012 01:33:19 +0000 (18:33 -0700)]
Merge "[MIPS] Support for TLS register"
Elliott Hughes [Fri, 3 Aug 2012 01:12:36 +0000 (18:12 -0700)]
Remove an awkward #include that is no longer upstream.
This was causing trouble in https://android-review.googlesource.com/#/c/37590/.
Change-Id: Ib7cb4fbaef6e9c1470c59f67d24bd24c7ce90bcc
Raghu Gandham [Fri, 3 Aug 2012 00:47:37 +0000 (17:47 -0700)]
[MIPS] Support for TLS register
Change-Id: I6b5194e5e379b573e3b1203d8015e20fb3edd647
Signed-off-by: Chris Dearman <chris@mips.com>
Elliott Hughes [Thu, 2 Aug 2012 23:39:18 +0000 (16:39 -0700)]
am
e5bd6efa: am
f94effda: am
fd4685be: am
52f3ee96: Merge "MIPS support for libc."
* commit '
e5bd6efa0805a743ed6c2022c65c5a8ff79d7310':
MIPS support for libc.
Elliott Hughes [Thu, 2 Aug 2012 23:37:07 +0000 (16:37 -0700)]
am
f94effda: am
fd4685be: am
52f3ee96: Merge "MIPS support for libc."
* commit '
f94effdab27f2bbe3f079d454e71ca9e60166318':
MIPS support for libc.
Elliott Hughes [Thu, 2 Aug 2012 23:34:57 +0000 (16:34 -0700)]
am
fd4685be: am
52f3ee96: Merge "MIPS support for libc."
* commit '
fd4685be87fa2c957d4f95deb75a6ba763fd7339':
MIPS support for libc.
Elliott Hughes [Thu, 2 Aug 2012 23:32:47 +0000 (16:32 -0700)]
am
52f3ee96: Merge "MIPS support for libc."
* commit '
52f3ee962b384bf247638adb653f0024ce92a895':
MIPS support for libc.
Elliott Hughes [Thu, 2 Aug 2012 23:14:47 +0000 (16:14 -0700)]
Merge "MIPS support for libc."
Elliott Hughes [Thu, 2 Aug 2012 23:13:40 +0000 (16:13 -0700)]
am
79d834b5: am
82dcfee5: am
19e30fc4: am
a1c0f08d: Merge "Fix a ENOTUP/ENOTSUP typo."
* commit '
79d834b5aba80407046ece1377033c8d48fbd427':
Fix a ENOTUP/ENOTSUP typo.
Elliott Hughes [Thu, 2 Aug 2012 23:13:38 +0000 (16:13 -0700)]
am
422067eb: am
c0719660: am
670766c5: am
994935f6: Merge "Error numbers are target specific."
* commit '
422067eb3ceba3c39903df5562cb8997b40d61c4':
Error numbers are target specific.
Elliott Hughes [Thu, 2 Aug 2012 23:10:34 +0000 (16:10 -0700)]
am
82dcfee5: am
19e30fc4: am
a1c0f08d: Merge "Fix a ENOTUP/ENOTSUP typo."
* commit '
82dcfee5fcd5243ff9df2aa7497e83dd567b6f95':
Fix a ENOTUP/ENOTSUP typo.
Elliott Hughes [Thu, 2 Aug 2012 23:10:32 +0000 (16:10 -0700)]
am
c0719660: am
670766c5: am
994935f6: Merge "Error numbers are target specific."
* commit '
c07196605cc9bb55af2173832536e342e902d2c5':
Error numbers are target specific.
Elliott Hughes [Thu, 2 Aug 2012 23:07:41 +0000 (16:07 -0700)]
am
19e30fc4: am
a1c0f08d: Merge "Fix a ENOTUP/ENOTSUP typo."
* commit '
19e30fc41030ab0524134b097dfef88baea14f4a':
Fix a ENOTUP/ENOTSUP typo.
Elliott Hughes [Thu, 2 Aug 2012 23:07:40 +0000 (16:07 -0700)]
am
670766c5: am
994935f6: Merge "Error numbers are target specific."
* commit '
670766c5649086ad5ffe26c0deadeb460139202f':
Error numbers are target specific.
Raghu Gandham [Thu, 26 Jul 2012 01:16:42 +0000 (18:16 -0700)]
MIPS support for libc.
Change-Id: I2864dea04b3faf2d919165dcaa600af5b16c41c8
Signed-off-by: Chris Dearman <chris@mips.com>
Signed-off-by: Raghu Gandham <raghu@mips.com>
Elliott Hughes [Thu, 2 Aug 2012 22:59:22 +0000 (15:59 -0700)]
am
a1c0f08d: Merge "Fix a ENOTUP/ENOTSUP typo."
* commit '
a1c0f08d3ccbe5c40be53903615e59113ade4922':
Fix a ENOTUP/ENOTSUP typo.
Elliott Hughes [Thu, 2 Aug 2012 22:59:21 +0000 (15:59 -0700)]
am
994935f6: Merge "Error numbers are target specific."
* commit '
994935f64cdbd7553ecbfbd15d4e4dd429277409':
Error numbers are target specific.
Elliott Hughes [Thu, 2 Aug 2012 22:46:43 +0000 (15:46 -0700)]
Merge "Fix a ENOTUP/ENOTSUP typo."
Elliott Hughes [Thu, 2 Aug 2012 22:45:45 +0000 (15:45 -0700)]
am
0b8dda0e: am
673c092e: am
54830578: am
f34ecbff: Merge "MIPS support to the linker"
* commit '
0b8dda0e422e9669af06d9e6d264fb14652b23b5':
MIPS support to the linker
Elliott Hughes [Thu, 2 Aug 2012 22:45:04 +0000 (15:45 -0700)]
Fix a ENOTUP/ENOTSUP typo.
Change-Id: Ifa347a09a2aa1f505965ae7c1383fd0caf95793c
Elliott Hughes [Thu, 2 Aug 2012 22:43:44 +0000 (15:43 -0700)]
am
673c092e: am
54830578: am
f34ecbff: Merge "MIPS support to the linker"
* commit '
673c092e0fc40afa291086d06ab39a6d22e7f894':
MIPS support to the linker
Elliott Hughes [Thu, 2 Aug 2012 22:42:48 +0000 (15:42 -0700)]
Merge "Error numbers are target specific."
Elliott Hughes [Thu, 2 Aug 2012 22:39:45 +0000 (15:39 -0700)]
am
54830578: am
f34ecbff: Merge "MIPS support to the linker"
* commit '
5483057817d071140d94299452b31881c4a6e748':
MIPS support to the linker
Brian Muramatsu [Thu, 2 Aug 2012 22:24:34 +0000 (15:24 -0700)]
am
fa22fd9f: am
402ec708: Merge "Update msm_camera.h to version that supports instance handle based lookup" into jb-mr1-dev
* commit '
fa22fd9f817e0fe49e0f7524f5589710f1140d8f':
Update msm_camera.h to version that supports instance handle based lookup
Brian Muramatsu [Thu, 2 Aug 2012 22:22:34 +0000 (15:22 -0700)]
am
402ec708: Merge "Update msm_camera.h to version that supports instance handle based lookup" into jb-mr1-dev
* commit '
402ec70899909f0b32c1ac304e3f26434424a3b3':
Update msm_camera.h to version that supports instance handle based lookup
Brian Muramatsu [Thu, 2 Aug 2012 22:20:57 +0000 (15:20 -0700)]
Merge "Update msm_camera.h to version that supports instance handle based lookup" into jb-mr1-dev
The Android Open Source Project [Thu, 2 Aug 2012 22:09:18 +0000 (15:09 -0700)]
am
d7b3cc0c: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
d7b3cc0c69b02cad4090a0068349f1ab83e3112f':
Elliott Hughes [Thu, 2 Aug 2012 21:57:52 +0000 (14:57 -0700)]
am
f34ecbff: Merge "MIPS support to the linker"
* commit '
f34ecbff0dd2b8e6961020b8c91260f33d4cf3ea':
MIPS support to the linker
Elliott Hughes [Thu, 2 Aug 2012 21:43:55 +0000 (14:43 -0700)]
Merge "MIPS support to the linker"
Raghu Gandham [Tue, 31 Jul 2012 19:07:22 +0000 (12:07 -0700)]
MIPS support to the linker
Change-Id: I37ec2d6c51d82bb9e9dbfef4b38c85366bead255
Signed-off-by: Chris Dearman <chris@mips.com>
Signed-off-by: Raghu Gandham <raghu@mips.com>
Signed-off-by: Bhanu Chetlapalli <bhanu@mips.com>
The Android Open Source Project [Thu, 2 Aug 2012 18:26:02 +0000 (11:26 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: Ia1f59a486efa98614b8f97f9432e1040c90d2ec7
The Android Automerger [Thu, 2 Aug 2012 14:41:45 +0000 (07:41 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Chris Dearman [Sat, 28 Jan 2012 01:55:49 +0000 (17:55 -0800)]
Error numbers are target specific.
Use the system supplied error numbers when mapping error numbers to messages.
Change-Id: I520556fa3e2ff668fdc4eda36ad31491fbb48ea8
Signed-off-by: Chris Dearman <chris@mips.com>
Signed-off-by: Raghu Gandham <raghu@mips.com>
The Android Open Source Project [Wed, 1 Aug 2012 21:50:42 +0000 (14:50 -0700)]
am
8f2f2466: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
8f2f24661870c349a19bff71d85ed5eb897c7c9f':
The Android Open Source Project [Wed, 1 Aug 2012 20:11:49 +0000 (13:11 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I2295284f2cccfc72a25c2675762cc613faa337a4
The Android Automerger [Wed, 1 Aug 2012 14:10:06 +0000 (07:10 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Ajay Dudani [Fri, 27 Jul 2012 00:26:05 +0000 (17:26 -0700)]
Update msm_camera.h to version that supports instance handle based lookup
Change-Id: If33a45f378e2cbbfe28b51643808df94e8d1f5e7
Shih-wei Liao [Wed, 1 Aug 2012 04:07:50 +0000 (21:07 -0700)]
am
cfc8b93c: am
4f13bdd4: am
7565d5b1: am
0ca9d074: Merge "Had include/arm/fenv.h, but missed include/mips/fenv.h."
* commit '
cfc8b93c4e223f72a2e419f4571f55f7eb819df3':
Had include/arm/fenv.h, but missed include/mips/fenv.h.
Shih-wei Liao [Wed, 1 Aug 2012 04:05:09 +0000 (21:05 -0700)]
am
4f13bdd4: am
7565d5b1: am
0ca9d074: Merge "Had include/arm/fenv.h, but missed include/mips/fenv.h."
* commit '
4f13bdd45c73194a49d3a5844746248c7dcd9432':
Had include/arm/fenv.h, but missed include/mips/fenv.h.
Shih-wei Liao [Wed, 1 Aug 2012 04:02:52 +0000 (21:02 -0700)]
am
7565d5b1: am
0ca9d074: Merge "Had include/arm/fenv.h, but missed include/mips/fenv.h."
* commit '
7565d5b118420cc0dff2d59cf3542e99f415601a':
Had include/arm/fenv.h, but missed include/mips/fenv.h.
Shih-wei Liao [Wed, 1 Aug 2012 04:00:39 +0000 (21:00 -0700)]
am
0ca9d074: Merge "Had include/arm/fenv.h, but missed include/mips/fenv.h."
* commit '
0ca9d0748e3229c849e3ee17259e0e55d7214800':
Had include/arm/fenv.h, but missed include/mips/fenv.h.
Shih-wei Liao [Wed, 1 Aug 2012 03:54:18 +0000 (20:54 -0700)]
Merge "Had include/arm/fenv.h, but missed include/mips/fenv.h."
Elliott Hughes [Tue, 31 Jul 2012 22:35:53 +0000 (15:35 -0700)]
am
029cf34c: am
81f1617a: am
8d2c5b24: am
b910b6f8: Merge "Updated the cleaned header file mman.h for MIPS."
* commit '
029cf34cfd3fc50fe373527c82855924a1db41ad':
Updated the cleaned header file mman.h for MIPS.
Elliott Hughes [Tue, 31 Jul 2012 22:33:45 +0000 (15:33 -0700)]
am
81f1617a: am
8d2c5b24: am
b910b6f8: Merge "Updated the cleaned header file mman.h for MIPS."
* commit '
81f1617a689931388c0b223ec729297b3a2bc792':
Updated the cleaned header file mman.h for MIPS.
Elliott Hughes [Tue, 31 Jul 2012 22:32:45 +0000 (15:32 -0700)]
am
8d2c5b24: am
b910b6f8: Merge "Updated the cleaned header file mman.h for MIPS."
* commit '
8d2c5b247e701f51ce3d750e9ee3ff37009630c3':
Updated the cleaned header file mman.h for MIPS.
Elliott Hughes [Tue, 31 Jul 2012 22:31:53 +0000 (15:31 -0700)]
am
b910b6f8: Merge "Updated the cleaned header file mman.h for MIPS."
* commit '
b910b6f8dee14e379664635f4cd7343b3acc7b27':
Updated the cleaned header file mman.h for MIPS.
Elliott Hughes [Tue, 31 Jul 2012 22:16:07 +0000 (15:16 -0700)]
Merge "Updated the cleaned header file mman.h for MIPS."
The Android Open Source Project [Tue, 31 Jul 2012 22:05:49 +0000 (15:05 -0700)]
am
6ac55791: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
6ac557918a1a5703f0376f659e5cb1a9af6a2901':
The Android Open Source Project [Tue, 31 Jul 2012 22:02:24 +0000 (15:02 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: Icba591905e72d5567b361d7e994cafc65e6f932a
Raghu Gandham [Thu, 26 Jul 2012 01:16:42 +0000 (18:16 -0700)]
Updated the cleaned header file mman.h for MIPS.
Change-Id: I8b3734e535711ca07fbf4066e6d967d1ce0f30eb
Elliott Hughes [Tue, 31 Jul 2012 17:43:46 +0000 (10:43 -0700)]
am
494e534b: am
f1997971: am
7645355e: am
a513f70b: Merge "bionic: Stack pointer/signal race condition."
* commit '
494e534b003a45c32e06d225cd89ad84777d28f7':
bionic: Stack pointer/signal race condition.
Elliott Hughes [Tue, 31 Jul 2012 17:43:45 +0000 (10:43 -0700)]
am
ad2e065d: am
b78aa539: am
bf397b60: am
21372896: Merge "fix __cxa_finalize() implementation to be thread safe."
* commit '
ad2e065de11748e1c33562cd2005ce14843d64f0':
fix __cxa_finalize() implementation to be thread safe.
Elliott Hughes [Tue, 31 Jul 2012 17:41:41 +0000 (10:41 -0700)]
am
f1997971: am
7645355e: am
a513f70b: Merge "bionic: Stack pointer/signal race condition."
* commit '
f19979710a2f34e5a6ef5cc6f900c40690d65db4':
bionic: Stack pointer/signal race condition.
Elliott Hughes [Tue, 31 Jul 2012 17:41:40 +0000 (10:41 -0700)]
am
b78aa539: am
bf397b60: am
21372896: Merge "fix __cxa_finalize() implementation to be thread safe."
* commit '
b78aa5390492cfe288d0128b749b18d2c740635e':
fix __cxa_finalize() implementation to be thread safe.
Elliott Hughes [Tue, 31 Jul 2012 17:40:06 +0000 (10:40 -0700)]
am
7645355e: am
a513f70b: Merge "bionic: Stack pointer/signal race condition."
* commit '
7645355ecdf29301bdc65f9ea8e00c20e51da3f5':
bionic: Stack pointer/signal race condition.
OSDN Git Service
