OSDN Git Service
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: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: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
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
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: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: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: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: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.
Elliott Hughes [Tue, 31 Jul 2012 17:40:05 +0000 (10:40 -0700)]
am
bf397b60: am
21372896: Merge "fix __cxa_finalize() implementation to be thread safe."
* commit '
bf397b601189f8a63c8a842e16af5ed004ef75f5':
fix __cxa_finalize() implementation to be thread safe.
Elliott Hughes [Tue, 31 Jul 2012 17:38:26 +0000 (10:38 -0700)]
am
a513f70b: Merge "bionic: Stack pointer/signal race condition."
* commit '
a513f70b43e75136145d756388b50028ac4fc4b8':
bionic: Stack pointer/signal race condition.
Elliott Hughes [Tue, 31 Jul 2012 17:38:25 +0000 (10:38 -0700)]
am
21372896: Merge "fix __cxa_finalize() implementation to be thread safe."
* commit '
21372896ea0f13938c130c8c82cdc3a6b9ccd297':
fix __cxa_finalize() implementation to be thread safe.
Elliott Hughes [Tue, 31 Jul 2012 17:32:58 +0000 (10:32 -0700)]
Merge "bionic: Stack pointer/signal race condition."
Elliott Hughes [Tue, 31 Jul 2012 17:31:20 +0000 (10:31 -0700)]
Merge "fix __cxa_finalize() implementation to be thread safe."
The Android Automerger [Tue, 31 Jul 2012 14:35:13 +0000 (07:35 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Srinavasa Nagaraju [Tue, 28 Feb 2012 03:08:22 +0000 (12:08 +0900)]
fix __cxa_finalize() implementation to be thread safe.
__cxa_finalize() modifies the access permissions of __atexit
global variable without acquiring _ATEXIT_LOCK(). Fix it prevent
any possible races.
Change-Id: I11939d0ebcbf6f360c14163222d40a449d96948e
Shih-wei Liao [Tue, 31 Jul 2012 03:12:46 +0000 (20:12 -0700)]
Had include/arm/fenv.h, but missed include/mips/fenv.h.
Needed for the device-build for LLVM's constant folding pass.
Change-Id: I412a98d52458231650801a8b59fe3159a789b8b9
Author: fu@mips.com
The Android Open Source Project [Mon, 30 Jul 2012 22:03:20 +0000 (15:03 -0700)]
Reconcile with jb-mr1-release
Change-Id: Ib68b14addd9f82526c451c988ae2e307cd7add19
Shih-wei Liao [Mon, 30 Jul 2012 20:13:26 +0000 (13:13 -0700)]
am
18421669: am
1ee6e3b7: Merge "Install crt(begin|end)_so.o to target library path."
* commit '
184216696a9945a5bf6cb186b4d3a42ffe582818':
Install crt(begin|end)_so.o to target library path.
Shih-wei Liao [Mon, 30 Jul 2012 20:10:11 +0000 (13:10 -0700)]
am
1ee6e3b7: Merge "Install crt(begin|end)_so.o to target library path."
* commit '
1ee6e3b7370b36ac72a14c0e31c34963b1bdbbb2':
Install crt(begin|end)_so.o to target library path.
Shih-wei Liao [Mon, 30 Jul 2012 19:44:57 +0000 (12:44 -0700)]
Merge "Install crt(begin|end)_so.o to target library path."
Ed Heyl [Mon, 30 Jul 2012 05:40:26 +0000 (22:40 -0700)]
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
Ed Heyl [Sun, 29 Jul 2012 15:22:16 +0000 (08:22 -0700)]
Merge jb-dev-mako plus fixes to libc/kernel/common/linux/fb.h
Change-Id: I1fbe64653db7b8e9bfc6e10fa42deb295aa15a09
Shih-wei Liao [Sat, 28 Jul 2012 07:33:28 +0000 (00:33 -0700)]
Install crt(begin|end)_so.o to target library path.
BUG=
6886348.
Change-Id: I176b2c4963d9731b06d10d4e0b92c010a0006b59
Elliott Hughes [Sat, 28 Jul 2012 01:32:56 +0000 (18:32 -0700)]
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.
Elliott Hughes [Sat, 28 Jul 2012 01:30:04 +0000 (18:30 -0700)]
am
7a450b4d: am
643e5722: Merge "Report errors to the log, not just stderr."
* commit '
7a450b4d9efc5457a987f5b5665ca7c6e7f57e34':
Report errors to the log, not just stderr.
Elliott Hughes [Sat, 28 Jul 2012 01:28:11 +0000 (18:28 -0700)]
am
643e5722: Merge "Report errors to the log, not just stderr."
* commit '
643e5722338d303c0b5aac41107432d8fde4081c':
Report errors to the log, not just stderr.
Elliott Hughes [Sat, 28 Jul 2012 01:16:17 +0000 (18:16 -0700)]
Merge "Report errors to the log, not just stderr."
Elliott Hughes [Sat, 28 Jul 2012 00:40:29 +0000 (17:40 -0700)]
Report errors to the log, not just stderr.
In particular this affects assert(3) and __cxa_pure_virtual, both of
which have managed to confuse people this week by apparently aborting
without reason. (Because stderr goes nowhere, normally.)
Bug:
6852995
Bug:
6840813
Change-Id: I7f5d17d5ddda439e217b7932096702dc013b9142
Elliott Hughes [Fri, 27 Jul 2012 23:25:03 +0000 (16:25 -0700)]
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.
Elliott Hughes [Fri, 27 Jul 2012 23:24:50 +0000 (16:24 -0700)]
am
d7dfcb0c: am
514ace95: am
9061c6e7: Merge "Replace ALL_PREBUILTS with BUILD_PREBUILT"
* commit '
d7dfcb0cb07bc1bb2b716075697f86de1b4d8e54':
Replace ALL_PREBUILTS with BUILD_PREBUILT
The Android Open Source Project [Fri, 27 Jul 2012 23:24:00 +0000 (16:24 -0700)]
Elliott Hughes [Fri, 27 Jul 2012 23:00:36 +0000 (16:00 -0700)]
am
616f3680: am
a7916509: Merge "Fix a TEMP_FAILURE_RETRY usage error in the linker."
* commit '
616f368076c9d7f0fc4459b79ba26c1d1ec0a247':
Fix a TEMP_FAILURE_RETRY usage error in the linker.
Elliott Hughes [Fri, 27 Jul 2012 22:58:57 +0000 (15:58 -0700)]
am
a7916509: Merge "Fix a TEMP_FAILURE_RETRY usage error in the linker."
* commit '
a7916509a3446afd0e863b03e4204cee73e81555':
Fix a TEMP_FAILURE_RETRY usage error in the linker.
Elliott Hughes [Fri, 27 Jul 2012 22:51:24 +0000 (15:51 -0700)]
am
514ace95: am
9061c6e7: Merge "Replace ALL_PREBUILTS with BUILD_PREBUILT"
* commit '
514ace9534233aa7ef5ff3f9d9c614c94eeefc1f':
Replace ALL_PREBUILTS with BUILD_PREBUILT
Elliott Hughes [Fri, 27 Jul 2012 22:47:37 +0000 (15:47 -0700)]
am
9061c6e7: Merge "Replace ALL_PREBUILTS with BUILD_PREBUILT"
* commit '
9061c6e7ae1d9b0e4d2f8a62b3682a565282f9b9':
Replace ALL_PREBUILTS with BUILD_PREBUILT
The Android Open Source Project [Fri, 27 Jul 2012 22:45:49 +0000 (15:45 -0700)]
Elliott Hughes [Fri, 27 Jul 2012 22:43:10 +0000 (15:43 -0700)]
Merge "Fix a TEMP_FAILURE_RETRY usage error in the linker."
Elliott Hughes [Fri, 27 Jul 2012 22:30:51 +0000 (15:30 -0700)]
Fix a TEMP_FAILURE_RETRY usage error in the linker.
Similar to the fix in
c20d0f3993ebb0d3dec958a306a68ebb48bfeadd.
grep(1) says this was the only other instance in bionic.
Change-Id: I1729038762ee1c7c4743a6bd11d5558afd6f5749
The Android Open Source Project [Fri, 27 Jul 2012 21:49:51 +0000 (14:49 -0700)]
Reconcile with jb-release
Change-Id: I89a2498aeb91f29a70f1e100c41f03cf41a2e49e
Elliott Hughes [Fri, 27 Jul 2012 21:14:41 +0000 (14:14 -0700)]
Merge "Replace ALL_PREBUILTS with BUILD_PREBUILT"
Ying Wang [Thu, 26 Jul 2012 22:55:18 +0000 (15:55 -0700)]
Replace ALL_PREBUILTS with BUILD_PREBUILT
(cherry-picked from
186b36b65bdfbf2c89a661539bf530359364eac9.)
Bug:
6857263
Change-Id: If787d84415dd2ac07105fe0d0b7a27c9be75df64
Elliott Hughes [Fri, 27 Jul 2012 17:21:45 +0000 (10:21 -0700)]
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
Elliott Hughes [Fri, 27 Jul 2012 17:16:50 +0000 (10:16 -0700)]
am
45038ae4: am
12f411d9: Merge "Correction to use of TEMP_FAILURE_RETRY in send_prop_msg"
* commit '
45038ae483313a5cc445a90fb0499d4c6ad69b1d':
Correction to use of TEMP_FAILURE_RETRY in send_prop_msg
Elliott Hughes [Fri, 27 Jul 2012 17:14:50 +0000 (10:14 -0700)]
am
12f411d9: Merge "Correction to use of TEMP_FAILURE_RETRY in send_prop_msg"
* commit '
12f411d9a696ca7a0fe490fb530a9accbda66a99':
Correction to use of TEMP_FAILURE_RETRY in send_prop_msg
Elliott Hughes [Fri, 27 Jul 2012 17:02:59 +0000 (10:02 -0700)]
Merge "Correction to use of TEMP_FAILURE_RETRY in send_prop_msg"
Jens Gulin [Thu, 19 Jul 2012 12:10:46 +0000 (14:10 +0200)]
Correction to use of TEMP_FAILURE_RETRY in send_prop_msg
RETRY macro may retry command if result is -1. In this
case the command was "connect < 0" instead of just
connect. The comparison will not return -1 and thus
retry is never done. This is now corrected so that
interrupts will cause retry instead of fail.
(There was no other negative side effect of the bug.
The result code from RETRY was used in an if-statement
and it would be true for all negative connect results.
This was according to expectations.)
Change-Id: Ie206b39878e9befea4e3be9a4061ee39eb232d80
Peter Enderborg [Mon, 9 Jul 2012 14:17:17 +0000 (16:17 +0200)]
bionic: Stack pointer/signal race condition.
Move the stackpointer so a captured signal does not corrupt
stack variables needed for __thread_entry.
Change-Id: I3e1e7b94a6d7cd3a07081f849043262743aa8064
Elliott Hughes [Fri, 27 Jul 2012 05:56:12 +0000 (22:56 -0700)]
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.
Elliott Hughes [Fri, 27 Jul 2012 05:34:57 +0000 (22:34 -0700)]
am
9a9ca7c1: am
7d6c3f70: Merge "Remove the \'Factory\' time zone by not processing the \'factory\' file."
* commit '
9a9ca7c1e8079aaae6b1833bd06719e98ca0783e':
Remove the 'Factory' time zone by not processing the 'factory' file.
Elliott Hughes [Fri, 27 Jul 2012 00:44:38 +0000 (17:44 -0700)]
am
7d6c3f70: Merge "Remove the \'Factory\' time zone by not processing the \'factory\' file."
* commit '
7d6c3f700b8089d31a33ba0f9f6eed9407724d0d':
Remove the 'Factory' time zone by not processing the 'factory' file.
Elliott Hughes [Fri, 27 Jul 2012 00:36:21 +0000 (17:36 -0700)]
Merge "Remove the 'Factory' time zone by not processing the 'factory' file."
Elliott Hughes [Thu, 26 Jul 2012 23:19:46 +0000 (16:19 -0700)]
Remove the 'Factory' time zone by not processing the 'factory' file.
The factory file (and Factory time zone) was meant as a way to say
"not configured" that would give a clear error when running date(1).
For us it would just look like UTC, so it is of no value.
Bug:
2997381
Change-Id: I1a4b85dce97d1d9370b22ba79e8fe5dafff56541
Ying Wang [Thu, 26 Jul 2012 22:55:18 +0000 (15:55 -0700)]
Replace ALL_PREBUILTS with BUILD_PREBUILT
Bug:
6857263
Change-Id: Ib639f1c4d572fec088298f95f6d5a2951d56cd12
Nick Kralevich [Thu, 26 Jul 2012 05:26:13 +0000 (22:26 -0700)]
am
b4fc64c9: am
cc5edd83: Merge "vfprintf: fix spelling."
* commit '
b4fc64c96cad1be63b5c52af835c4a93b0e60204':
vfprintf: fix spelling.
Nick Kralevich [Thu, 26 Jul 2012 05:22:20 +0000 (22:22 -0700)]
am
cc5edd83: Merge "vfprintf: fix spelling."
* commit '
cc5edd83ec0303ceb682c563073d98f8a592737d':
vfprintf: fix spelling.
Nick Kralevich [Wed, 25 Jul 2012 23:09:34 +0000 (16:09 -0700)]
Merge "vfprintf: fix spelling."
Nick Kralevich [Wed, 25 Jul 2012 23:01:38 +0000 (16:01 -0700)]
vfprintf: fix spelling.
Change-Id: I6dc611143fb1f3e9ccf0a77b40ee48a3c1d72ca9
The Android Automerger [Wed, 25 Jul 2012 03:23:07 +0000 (20:23 -0700)]
merge in jb-release history after reset to jb-dev
Elliott Hughes [Wed, 25 Jul 2012 01:05:28 +0000 (18:05 -0700)]
am
9dbd4c06: am
c27103d8: Merge "[MIPS] Use an aligned address to provoke SIGSEGV in abort()"
* commit '
9dbd4c06fe143a4187d2d8d418c1a3b7c1ed39ba':
[MIPS] Use an aligned address to provoke SIGSEGV in abort()
Elliott Hughes [Wed, 25 Jul 2012 01:05:27 +0000 (18:05 -0700)]
am
860dc7e2: am
c98e2365: Merge "Fix implementation of generic atomic operations"
* commit '
860dc7e25d4ba64b5bd49fe123bae6e6105dd2e7':
Fix implementation of generic atomic operations
Elliott Hughes [Wed, 25 Jul 2012 01:03:22 +0000 (18:03 -0700)]
am
c27103d8: Merge "[MIPS] Use an aligned address to provoke SIGSEGV in abort()"
* commit '
c27103d84c124d40f3f4cff46d7cfa74342e0585':
[MIPS] Use an aligned address to provoke SIGSEGV in abort()
Elliott Hughes [Wed, 25 Jul 2012 01:03:12 +0000 (18:03 -0700)]
am
c98e2365: Merge "Fix implementation of generic atomic operations"
* commit '
c98e2365cdd0c2330711118b689171df143f6399':
Fix implementation of generic atomic operations
Elliott Hughes [Wed, 25 Jul 2012 00:42:51 +0000 (17:42 -0700)]
Merge "[MIPS] Use an aligned address to provoke SIGSEGV in abort()"
Chris Dearman [Tue, 10 Jul 2012 18:46:55 +0000 (11:46 -0700)]
[MIPS] Use an aligned address to provoke SIGSEGV in abort()
Change-Id: I269c9ccc07058773fb0f9d70673673157ab38f6a
Elliott Hughes [Wed, 25 Jul 2012 00:21:46 +0000 (17:21 -0700)]
Merge "Fix implementation of generic atomic operations"
Chris Dearman [Tue, 24 Jul 2012 00:30:04 +0000 (17:30 -0700)]
Fix implementation of generic atomic operations
Change-Id: Ie1ea5aacc561e2d6d40125d2952ed0e9116b7b0d
Elliott Hughes [Tue, 24 Jul 2012 20:53:37 +0000 (13:53 -0700)]
am
d33ce20e: am
344aca8c: Merge "[MIPS] Add atomic routines"
* commit '
d33ce20e6dfbe5be081867c9ace538022991bb10':
[MIPS] Add atomic routines
Elliott Hughes [Tue, 24 Jul 2012 20:51:10 +0000 (13:51 -0700)]
am
344aca8c: Merge "[MIPS] Add atomic routines"
* commit '
344aca8ced2522074f799439e201226377d02dba':
[MIPS] Add atomic routines
Elliott Hughes [Tue, 24 Jul 2012 20:41:05 +0000 (13:41 -0700)]
Merge "[MIPS] Add atomic routines"
Raghu Gandham [Fri, 29 Jun 2012 22:52:55 +0000 (15:52 -0700)]
[MIPS] Add atomic routines
Change-Id: I2cb20ce44dd230d222b7fc1ede2e1e3dce6e692b
Elliott Hughes [Tue, 24 Jul 2012 02:04:50 +0000 (19:04 -0700)]
am
5e2a2705: am
b109e437: Merge "Upgrade to tzdata2012d."
* commit '
5e2a2705f237130bc516b62ff1372e94ad508f12':
Upgrade to tzdata2012d.
Elliott Hughes [Sat, 21 Jul 2012 21:20:17 +0000 (14:20 -0700)]
am
b109e437: Merge "Upgrade to tzdata2012d."
* commit '
b109e437fcbc1cbe09fce8ce2abb6f951d5a0274':
Upgrade to tzdata2012d.
Elliott Hughes [Sat, 21 Jul 2012 21:09:23 +0000 (14:09 -0700)]
Merge "Upgrade to tzdata2012d."
Elliott Hughes [Fri, 20 Jul 2012 23:52:39 +0000 (16:52 -0700)]
Upgrade to tzdata2012d.
This upgrade involved rewriting the script; the data has moved to ftp.iana.org,
where it's slightly less convenient to access, so it's time to use something
that can talk FTP...
As for tzdata2012d, it's just updating Morocco for this weekend's changes, now
they've been decided at the last minute (as usual).
Change-Id: I772df57a6e09b3bf3d9541bfc08930d6f18633b4
Elliott Hughes [Fri, 20 Jul 2012 17:00:47 +0000 (10:00 -0700)]
am
a94c708a: am
654b1501: Merge "Update time.h for CLOCK_BOOTTIME."
* commit '
a94c708a15713535c0ece63ffc43d016eccfebe1':
Update time.h for CLOCK_BOOTTIME.
Naseer Ahmed [Wed, 18 Jul 2012 20:47:28 +0000 (13:47 -0700)]
bionic: Update MDP and rotator headers
Change-Id: I585e07b004dfa6b5113050211ca67e4c057f5531
Elliott Hughes [Fri, 20 Jul 2012 00:37:33 +0000 (17:37 -0700)]
am
654b1501: Merge "Update time.h for CLOCK_BOOTTIME."
* commit '
654b1501f7a936034d07f579c3d4a15d1319dac2':
Update time.h for CLOCK_BOOTTIME.
Elliott Hughes [Fri, 20 Jul 2012 00:18:36 +0000 (17:18 -0700)]
Merge "Update time.h for CLOCK_BOOTTIME."
Nick Pelly [Thu, 19 Jul 2012 20:50:55 +0000 (13:50 -0700)]
Update time.h for CLOCK_BOOTTIME.
(cherry-pick of
8958a383296ea0e1cc106ae245c37671809ffd49)
Change-Id: Ie8de6b32fa81566db53ad7e9fd4b197f4cede628
Nick Pelly [Thu, 19 Jul 2012 20:50:55 +0000 (13:50 -0700)]
Update time.h for CLOCK_BOOTTIME.
Change-Id: Iafbc6a2f57587feb68526e4eab67452aa0db5311
The Android Open Source Project [Thu, 19 Jul 2012 15:35:39 +0000 (08:35 -0700)]
Reconcile with jb-mr0-release
Change-Id: I5e181b92fbcc4b3d312396124a149f1c5224e55b
Ajay Dudani [Thu, 19 Jul 2012 09:58:07 +0000 (02:58 -0700)]
Adding msm_dsps.h header
Change-Id: I7736a3a895b9c81d5184f7c97ac0ed5aeb138d25
The Android Automerger [Thu, 19 Jul 2012 06:04:34 +0000 (23:04 -0700)]
merge in jb-release history after reset to jb-dev
OSDN Git Service
