OSDN Git Service
Elliott Hughes [Fri, 15 Mar 2013 23:43:01 +0000 (23:43 +0000)]
am
cf23cbb1: am
12ea8005: am
5f829205: am
c1416647: Merge "Clean up internal libc logging."
* commit '
cf23cbb1d4826ac579fae28e4fe796a6e4e1ddfd':
Clean up internal libc logging.
Elliott Hughes [Fri, 15 Mar 2013 23:40:15 +0000 (23:40 +0000)]
am
12ea8005: am
5f829205: am
c1416647: Merge "Clean up internal libc logging."
* commit '
12ea8005665085ae82c1b233ae93d12855e04b8b':
Clean up internal libc logging.
Elliott Hughes [Fri, 15 Mar 2013 23:36:37 +0000 (16:36 -0700)]
am
5f829205: am
c1416647: Merge "Clean up internal libc logging."
* commit '
5f8292050fc07f4bf9e70f37a807ad028e3cfc87':
Clean up internal libc logging.
Elliott Hughes [Fri, 15 Mar 2013 23:34:05 +0000 (16:34 -0700)]
am
c1416647: Merge "Clean up internal libc logging."
* commit '
c14166477e7fd22693eab194d37624c2f7506ce4':
Clean up internal libc logging.
Elliott Hughes [Fri, 15 Mar 2013 23:21:36 +0000 (23:21 +0000)]
Merge "Clean up internal libc logging."
Elliott Hughes [Fri, 15 Mar 2013 22:30:25 +0000 (15:30 -0700)]
Clean up internal libc logging.
We only need one logging API, and I prefer the one that does no
allocation and is thus safe to use in any context.
Also use O_CLOEXEC when opening the /dev/log files.
Move everything logging-related into one header file.
Change-Id: Ic1e3ea8e9b910dc29df351bff6c0aa4db26fbb58
Elliott Hughes [Fri, 15 Mar 2013 18:49:50 +0000 (18:49 +0000)]
am
270595f4: am
e1b0db13: am
50d42294: am
e23ed8c6: Merge "Remove useless workaround for HTC RIL bugs."
* commit '
270595f4c976a86033ac099a283299c2ec53f24a':
Remove useless workaround for HTC RIL bugs.
Elliott Hughes [Fri, 15 Mar 2013 18:47:48 +0000 (18:47 +0000)]
am
e1b0db13: am
50d42294: am
e23ed8c6: Merge "Remove useless workaround for HTC RIL bugs."
* commit '
e1b0db1392050900e1f38b16ec2c8e213308e267':
Remove useless workaround for HTC RIL bugs.
Elliott Hughes [Fri, 15 Mar 2013 18:46:05 +0000 (11:46 -0700)]
am
50d42294: am
e23ed8c6: Merge "Remove useless workaround for HTC RIL bugs."
* commit '
50d42294bdc983e05eca0fb0099bbb9f634fd5e3':
Remove useless workaround for HTC RIL bugs.
Elliott Hughes [Fri, 15 Mar 2013 18:43:50 +0000 (11:43 -0700)]
am
e23ed8c6: Merge "Remove useless workaround for HTC RIL bugs."
* commit '
e23ed8c6441389a79c6504295184f7249e01a197':
Remove useless workaround for HTC RIL bugs.
Elliott Hughes [Fri, 15 Mar 2013 18:26:49 +0000 (18:26 +0000)]
Merge "Remove useless workaround for HTC RIL bugs."
Elliott Hughes [Fri, 15 Mar 2013 18:21:15 +0000 (11:21 -0700)]
Remove useless workaround for HTC RIL bugs.
HTC's RIL uses the liblog logging, not ours.
Change-Id: I56f9304e833ccb329df4ee55042012d7ad5f73ed
Elliott Hughes [Fri, 15 Mar 2013 00:45:09 +0000 (00:45 +0000)]
am
c204b501: am
9ede4549: am
f8d689bc: am
4d696eb4: Merge "Fix a bug in ZoneCompactor that meant the zonetab offset was wrong."
* commit '
c204b501f44d7b08e2be06693322d5426b3f85ef':
Fix a bug in ZoneCompactor that meant the zonetab offset was wrong.
Elliott Hughes [Fri, 15 Mar 2013 00:44:05 +0000 (00:44 +0000)]
am
9ede4549: am
f8d689bc: am
4d696eb4: Merge "Fix a bug in ZoneCompactor that meant the zonetab offset was wrong."
* commit '
9ede4549fe083e54cdf2f34b177fc32777f61fac':
Fix a bug in ZoneCompactor that meant the zonetab offset was wrong.
Elliott Hughes [Fri, 15 Mar 2013 00:42:42 +0000 (17:42 -0700)]
am
f8d689bc: am
4d696eb4: Merge "Fix a bug in ZoneCompactor that meant the zonetab offset was wrong."
* commit '
f8d689bc56976f8bd37b306053154a0e9d17fb1d':
Fix a bug in ZoneCompactor that meant the zonetab offset was wrong.
Elliott Hughes [Fri, 15 Mar 2013 00:40:26 +0000 (17:40 -0700)]
am
4d696eb4: Merge "Fix a bug in ZoneCompactor that meant the zonetab offset was wrong."
* commit '
4d696eb49d24590a6d6d25657b5bc0103e2d90ba':
Fix a bug in ZoneCompactor that meant the zonetab offset was wrong.
Elliott Hughes [Fri, 15 Mar 2013 00:30:48 +0000 (00:30 +0000)]
Merge "Fix a bug in ZoneCompactor that meant the zonetab offset was wrong."
Elliott Hughes [Fri, 15 Mar 2013 00:10:24 +0000 (17:10 -0700)]
Fix a bug in ZoneCompactor that meant the zonetab offset was wrong.
Bug:
8391426
Change-Id: Ia4a8889b5a613aa96bb3fb5d89a921c913ff7626
Christopher Ferris [Thu, 14 Mar 2013 23:43:26 +0000 (23:43 +0000)]
am
8dcbb90d: am
f85fc022: am
f694ed1c: am
d30b9f09: Merge "Remove unused arm defines."
* commit '
8dcbb90dea22a876d9cc517f382bb82c98d87450':
Remove unused arm defines.
Christopher Ferris [Thu, 14 Mar 2013 23:40:36 +0000 (23:40 +0000)]
am
f85fc022: am
f694ed1c: am
d30b9f09: Merge "Remove unused arm defines."
* commit '
f85fc022f5ad405a7e43ecb6f48bcc6e061e01b5':
Remove unused arm defines.
Christopher Ferris [Thu, 14 Mar 2013 23:36:45 +0000 (16:36 -0700)]
am
f694ed1c: am
d30b9f09: Merge "Remove unused arm defines."
* commit '
f694ed1cdbfd2d26cdc2a008b67bfd3451522c8f':
Remove unused arm defines.
Christopher Ferris [Thu, 14 Mar 2013 23:32:21 +0000 (16:32 -0700)]
am
d30b9f09: Merge "Remove unused arm defines."
* commit '
d30b9f0912b4763f0d98bdee23064015223ec03f':
Remove unused arm defines.
Christopher Ferris [Thu, 14 Mar 2013 23:23:42 +0000 (23:23 +0000)]
Merge "Remove unused arm defines."
Elliott Hughes [Thu, 14 Mar 2013 22:35:28 +0000 (22:35 +0000)]
am
2d48d0ea: am
c9358706: am
2e7b8d63: am
f861bc5c: Merge "Don\'t search off the end of the index for bad Olson ids."
* commit '
2d48d0ea36395da9af4537195483b006900bf7bd':
Don't search off the end of the index for bad Olson ids.
Elliott Hughes [Thu, 14 Mar 2013 22:33:35 +0000 (22:33 +0000)]
am
c9358706: am
2e7b8d63: am
f861bc5c: Merge "Don\'t search off the end of the index for bad Olson ids."
* commit '
c9358706c6f48eb27f785f3bf15b2ab0d50ff7bc':
Don't search off the end of the index for bad Olson ids.
Christopher Ferris [Thu, 28 Feb 2013 00:25:03 +0000 (16:25 -0800)]
Remove unused arm defines.
The defines HAVE_32_BYTE_CACHE_LINES and ARCH_ARM_USE_NON_NEON_MEMCPY
are not used by any code. The previous memcpy code that used these
has been split into different architecture versions to avoid the need
for them.
Bug:
8005082
Merge from internal master.
(cherry-picked from commit
6e1a5cf31ba47508b08dba02a45b4ea6e1edd6d2)
Change-Id: Ib18fc3f4131b21cdbd19b9dde7697ac25d066fcf
Elliott Hughes [Thu, 14 Mar 2013 22:30:13 +0000 (15:30 -0700)]
am
2e7b8d63: am
f861bc5c: Merge "Don\'t search off the end of the index for bad Olson ids."
* commit '
2e7b8d6399fdea6e43dd07f353346324d2bf4ec4':
Don't search off the end of the index for bad Olson ids.
Elliott Hughes [Thu, 14 Mar 2013 22:17:09 +0000 (15:17 -0700)]
am
f861bc5c: Merge "Don\'t search off the end of the index for bad Olson ids."
* commit '
f861bc5cc3e17322e49f89deea61f278aaefbe76':
Don't search off the end of the index for bad Olson ids.
Elliott Hughes [Thu, 14 Mar 2013 22:05:44 +0000 (22:05 +0000)]
Merge "Don't search off the end of the index for bad Olson ids."
Elliott Hughes [Thu, 14 Mar 2013 21:38:08 +0000 (14:38 -0700)]
Don't search off the end of the index for bad Olson ids.
In the old code, the index was a file to itself, so it made sense to
read until you hit the end of the file. In the new code, the index is
followed by hundreds of KiB of data, so we need to just search the
index.
Bug:
8368791
Change-Id: Icf5f8b5516cf3a93679fa849c9f6cd1cb100e0f1
Christopher Ferris [Thu, 14 Mar 2013 21:18:19 +0000 (21:18 +0000)]
Merge "Create arch specific versions of strcmp."
Elliott Hughes [Wed, 13 Mar 2013 01:00:12 +0000 (01:00 +0000)]
am
76ade2ed: am
f557e90b: am
2f44c05b: am
ec706c24: Merge "Use the kernel\'s MAX_ERRNO in the syscall stubs."
* commit '
76ade2ed6077fec0a4978ef7e7e2a99578512c39':
Use the kernel's MAX_ERRNO in the syscall stubs.
Elliott Hughes [Wed, 13 Mar 2013 00:58:27 +0000 (00:58 +0000)]
am
f557e90b: am
2f44c05b: am
ec706c24: Merge "Use the kernel\'s MAX_ERRNO in the syscall stubs."
* commit '
f557e90b348d9a3294391076bcd6604a13c803b6':
Use the kernel's MAX_ERRNO in the syscall stubs.
Elliott Hughes [Wed, 13 Mar 2013 00:55:54 +0000 (17:55 -0700)]
am
2f44c05b: am
ec706c24: Merge "Use the kernel\'s MAX_ERRNO in the syscall stubs."
* commit '
2f44c05bc54073aa6decfc5d933b7e77e7ce5768':
Use the kernel's MAX_ERRNO in the syscall stubs.
Elliott Hughes [Wed, 13 Mar 2013 00:54:00 +0000 (17:54 -0700)]
am
ec706c24: Merge "Use the kernel\'s MAX_ERRNO in the syscall stubs."
* commit '
ec706c24acb4d1db6a583a57b76adfb9250d39eb':
Use the kernel's MAX_ERRNO in the syscall stubs.
Elliott Hughes [Wed, 13 Mar 2013 00:44:33 +0000 (00:44 +0000)]
Merge "Use the kernel's MAX_ERRNO in the syscall stubs."
Elliott Hughes [Tue, 12 Mar 2013 21:57:30 +0000 (14:57 -0700)]
Use the kernel's MAX_ERRNO in the syscall stubs.
Bug: http://code.google.com/p/android/issues/detail?id=53104
Change-Id: Iaabf7025b153e96dc5eca231a33a32d4cb7d8116
Christopher Ferris [Tue, 12 Mar 2013 22:45:21 +0000 (22:45 +0000)]
am
8cca0154: am
b0b974c1: am
2a66ccf1: am
980508b0: Merge "Break bionic implementations into arch versions."
* commit '
8cca015403f2f021d557fc81a0423a04a551448a':
Break bionic implementations into arch versions.
Christopher Ferris [Tue, 12 Mar 2013 22:43:05 +0000 (22:43 +0000)]
am
b0b974c1: am
2a66ccf1: am
980508b0: Merge "Break bionic implementations into arch versions."
* commit '
b0b974c10ce3494fe58be1a3f419656f95c54331':
Break bionic implementations into arch versions.
Christopher Ferris [Tue, 12 Mar 2013 22:40:22 +0000 (15:40 -0700)]
am
2a66ccf1: am
980508b0: Merge "Break bionic implementations into arch versions."
* commit '
2a66ccf1bb4dd0183b65264cb8107ba70748f626':
Break bionic implementations into arch versions.
Christopher Ferris [Tue, 12 Mar 2013 22:39:38 +0000 (15:39 -0700)]
am
980508b0: Merge "Break bionic implementations into arch versions."
* commit '
980508b0ead3ee01e99e93635c57eb76d1aba62d':
Break bionic implementations into arch versions.
Christopher Ferris [Tue, 12 Mar 2013 22:24:09 +0000 (22:24 +0000)]
Merge "Break bionic implementations into arch versions."
Christopher Ferris [Tue, 26 Feb 2013 09:30:00 +0000 (01:30 -0800)]
Break bionic implementations into arch versions.
Move arch specific code for arm, mips, x86 into separate
makefiles.
In addition, add different arm cpu versions of memcpy/memset.
Bug:
8005082
Merge from internal master (
acdde8c1cf8e8beed98c052757d96695b820b50c).
Change-Id: I04f3d0715104fab618e1abf7cf8f7eec9bec79df
Elliott Hughes [Tue, 12 Mar 2013 19:24:10 +0000 (19:24 +0000)]
am
0052a618: am
b4d6f28c: am
a3214c65: am
94a34010: Merge "Support large errno values on ARM."
* commit '
0052a6188ba20c3a9ea99f974bce0c143bd379cb':
Support large errno values on ARM.
Elliott Hughes [Tue, 12 Mar 2013 19:22:50 +0000 (19:22 +0000)]
am
b4d6f28c: am
a3214c65: am
94a34010: Merge "Support large errno values on ARM."
* commit '
b4d6f28cc33f438f9859d6ab5f91e7f2ee1d6d33':
Support large errno values on ARM.
Elliott Hughes [Tue, 12 Mar 2013 19:18:49 +0000 (12:18 -0700)]
am
a3214c65: am
94a34010: Merge "Support large errno values on ARM."
* commit '
a3214c65620827628a87849a5fbad5a4ef97eeb1':
Support large errno values on ARM.
Elliott Hughes [Tue, 12 Mar 2013 19:17:15 +0000 (12:17 -0700)]
am
94a34010: Merge "Support large errno values on ARM."
* commit '
94a34010c1f989032c0a4dc7a7a68d069ca23b1e':
Support large errno values on ARM.
Elliott Hughes [Tue, 12 Mar 2013 19:08:36 +0000 (19:08 +0000)]
Merge "Support large errno values on ARM."
Elliott Hughes [Tue, 12 Mar 2013 19:07:18 +0000 (19:07 +0000)]
am
60414ba1: am
746f1286: am
5d998b4a: am
f21aa3b6: Merge "Use more types than just \'unsigned\' in the linker."
* commit '
60414ba165da87e427aef45b651ec7d4f26b084f':
Use more types than just 'unsigned' in the linker.
Elliott Hughes [Tue, 12 Mar 2013 19:05:53 +0000 (19:05 +0000)]
am
746f1286: am
5d998b4a: am
f21aa3b6: Merge "Use more types than just \'unsigned\' in the linker."
* commit '
746f128602772997b57e24fc8546473d01d6f955':
Use more types than just 'unsigned' in the linker.
Elliott Hughes [Tue, 12 Mar 2013 19:03:06 +0000 (12:03 -0700)]
am
5d998b4a: am
f21aa3b6: Merge "Use more types than just \'unsigned\' in the linker."
* commit '
5d998b4a21aab09da750e8e43cb608f5ee6b1f3d':
Use more types than just 'unsigned' in the linker.
Elliott Hughes [Tue, 12 Mar 2013 19:00:55 +0000 (12:00 -0700)]
am
f21aa3b6: Merge "Use more types than just \'unsigned\' in the linker."
* commit '
f21aa3b61ebc6b1a7c34265699f40bd9b5af7952':
Use more types than just 'unsigned' in the linker.
Elliott Hughes [Tue, 12 Mar 2013 18:55:45 +0000 (11:55 -0700)]
Support large errno values on ARM.
Bug: http://code.google.com/p/android/issues/detail?id=53104
Change-Id: Ic6c40be2dc50f0644a3d8b09ceae59c38f2d5b53
Elliott Hughes [Tue, 12 Mar 2013 18:54:27 +0000 (18:54 +0000)]
Merge "Use more types than just 'unsigned' in the linker."
Elliott Hughes [Tue, 12 Mar 2013 17:40:45 +0000 (10:40 -0700)]
Use more types than just 'unsigned' in the linker.
Still chipping away at the situation where every variable in the
linker was of type 'unsigned'. This patch switches counts over to
being size_t and adds an explicit type for init/fini function pointers
and arrays of function pointers.
Also improve logging from CallArray.
Also remove trailing "\n"s from log messages.
Change-Id: Ie036d2622caac50f4d29f0570888bb527661d77e
Elliott Hughes [Tue, 12 Mar 2013 17:43:55 +0000 (17:43 +0000)]
am
5487ecb5: am
e9cdce33: am
3c9afb5e: am
6b4c77f8: Merge "Use Elf32_Addr instead of unsigned in linker"
* commit '
5487ecb52a328906b81635f8c8018f48031c19a1':
Use Elf32_Addr instead of unsigned in linker
Elliott Hughes [Tue, 12 Mar 2013 17:42:37 +0000 (17:42 +0000)]
am
e9cdce33: am
3c9afb5e: am
6b4c77f8: Merge "Use Elf32_Addr instead of unsigned in linker"
* commit '
e9cdce33f398e43952d11ef38027e2d255f16531':
Use Elf32_Addr instead of unsigned in linker
Elliott Hughes [Tue, 12 Mar 2013 17:40:56 +0000 (10:40 -0700)]
am
3c9afb5e: am
6b4c77f8: Merge "Use Elf32_Addr instead of unsigned in linker"
* commit '
3c9afb5e17eaa2ed5a12d71a1a09fe85f06fcb48':
Use Elf32_Addr instead of unsigned in linker
Elliott Hughes [Tue, 12 Mar 2013 17:38:46 +0000 (10:38 -0700)]
am
6b4c77f8: Merge "Use Elf32_Addr instead of unsigned in linker"
* commit '
6b4c77f854c079138d552608b9df5fa3035f0fcc':
Use Elf32_Addr instead of unsigned in linker
Christopher Ferris [Sat, 9 Mar 2013 00:50:31 +0000 (16:50 -0800)]
Create arch specific versions of strcmp.
This uses the new strcmp.a15.S code as the basis for new versions
of strcmp.S.
The cortex-a15 code is the performance optimized version of strcmp.a15.S
taken with only the addition of a few pld instructions.
The cortex-a9 code is the same as the cortex-a15 code except that the
unaligned strcmp code was taken from the original strcmp.S.
The krait code is the same as the cortex-a15 code except that one path
in the unaligned strcmp code was taken from the original strcmp.S code
(the 2 byte overlap case).
The generic code is the original unmodified strmp.S from the bionic
subdirectory.
All three new versions underwent these test cases:
Strings the same, all same size:
- Both pointers double word aligned.
- One pointer double word aligned, one pointer word aligned.
- Both pointers word aligned.
- One pointer double word aligned, one pointer 1 off a word alignment.
- One pointer double word aligned, one pointer 2 off a word alignment.
- One pointer double word aligned, one pointer 3 off a word alignment.
- One pointer word aligned, one pointer 1 off a word alignment.
- One pointer word aligned, one pointer 2 off a word alignment.
- One pointer word aligned, one pointer 3 off a word alignment.
For all cases where it made sense, the two pointers were also tested
swapped.
Different strings, all same size:
- Single difference at double word boundary.
- Single difference at word boudary.
- Single difference at 1 off a word alignment.
- Single difference at 2 off a word alignment.
- Single difference at 3 off a word alignment.
Different sized strings, strings the same until the end:
- Shorter string ends on a double word boundary.
- Shorter string ends on word boundary.
- Shorter string ends at 1 off a word boundary.
- Shorter string ends at 2 off a word boundary.
- Shorter string ends at 3 off a word boundary.
For all different cases, run them through the same pointer alignment
cases when the strings are the same size.
For all cases the two pointers were also tested swapped.
Bug:
8005082
Change-Id: I5f3dc02b48afba2cb9c13332ab45c828ff171a1c
Elliott Hughes [Tue, 12 Mar 2013 17:24:03 +0000 (17:24 +0000)]
Merge "Use Elf32_Addr instead of unsigned in linker"
Kito Cheng [Tue, 12 Mar 2013 06:58:06 +0000 (14:58 +0800)]
Use Elf32_Addr instead of unsigned in linker
Change-Id: I52dcbb4b0ff0a4052e0ad7a9bbeb2df65c9d2f66
The Android Open Source Project [Tue, 12 Mar 2013 14:16:36 +0000 (14:16 +0000)]
am
7c8af225: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
7c8af2252a5814a34f30922ac7d5d63bd891e525':
The Android Open Source Project [Tue, 12 Mar 2013 14:14:11 +0000 (07:14 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Ia0c7d98294053c4dfab78608959f2f3f53c8e2a0
The Android Automerger [Tue, 12 Mar 2013 12:55:15 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Elliott Hughes [Tue, 12 Mar 2013 01:50:53 +0000 (01:50 +0000)]
am
03e71235: am
8c73f69c: am
36cb88b7: am
53630c0e: Merge "Cache the most-recently used timezone for mktime_tz and localtime_tz."
* commit '
03e712357d1f4de204ac9ad5cbef53acba48db9d':
Cache the most-recently used timezone for mktime_tz and localtime_tz.
Elliott Hughes [Tue, 12 Mar 2013 01:48:34 +0000 (01:48 +0000)]
am
8c73f69c: am
36cb88b7: am
53630c0e: Merge "Cache the most-recently used timezone for mktime_tz and localtime_tz."
* commit '
8c73f69cf42d78f37b9b82bf0cc62d2cd1985fcc':
Cache the most-recently used timezone for mktime_tz and localtime_tz.
Elliott Hughes [Tue, 12 Mar 2013 01:46:23 +0000 (18:46 -0700)]
am
36cb88b7: am
53630c0e: Merge "Cache the most-recently used timezone for mktime_tz and localtime_tz."
* commit '
36cb88b70c39e507e9017f0bd7121da57e568744':
Cache the most-recently used timezone for mktime_tz and localtime_tz.
Elliott Hughes [Tue, 12 Mar 2013 01:44:19 +0000 (18:44 -0700)]
am
53630c0e: Merge "Cache the most-recently used timezone for mktime_tz and localtime_tz."
* commit '
53630c0e5bb6f845ba633e8dedc08b827f7b5d0c':
Cache the most-recently used timezone for mktime_tz and localtime_tz.
Elliott Hughes [Tue, 12 Mar 2013 01:28:36 +0000 (01:28 +0000)]
Merge "Cache the most-recently used timezone for mktime_tz and localtime_tz."
Elliott Hughes [Tue, 12 Mar 2013 00:17:02 +0000 (17:17 -0700)]
Cache the most-recently used timezone for mktime_tz and localtime_tz.
Normally, the C library implicitly caches your timezone by virtue
of the fact that the prehistoric API assumes a single timezone for
the entire process.
The unfortunate mktime_tz and localtime_tz extensions work around
this, but represent timezones as strings to their callers, so code
that makes heavy use of these needs a cache to be able to perform
acceptably until it can hopefully one day be rewritten to use
java.util.Calendar or icu4c.
Bug:
8270865
Change-Id: I92e3964e86dc33ceac925f819cc5e26ff4203f50
Jean-Baptiste Queru [Mon, 11 Mar 2013 19:51:51 +0000 (19:51 +0000)]
am
1467dfa5: (-s ours) am
a60f3818: am
b2525ba8: am
7915b22e: am
a4b20d71: am
b8e1033c: (-s ours) am
e5412a9a: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
1467dfa5cd28b8b4e07cfe86b020a07bd0d0da24':
Jean-Baptiste Queru [Mon, 11 Mar 2013 19:41:34 +0000 (19:41 +0000)]
am
a60f3818: am
b2525ba8: am
7915b22e: am
a4b20d71: am
b8e1033c: (-s ours) am
e5412a9a: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
a60f38181465d5f5a37ea8f9ad34326ea2e21ef0':
Elliott Hughes [Mon, 11 Mar 2013 19:41:19 +0000 (19:41 +0000)]
am
9969b48d: am
60ac09bd: am
6d6f5e61: am
4b032ee9: Merge "Let bionic use the correct definition of ssize_t."
* commit '
9969b48d235e71f87be67549fdd274c8e82f3f6f':
Let bionic use the correct definition of ssize_t.
Jean-Baptiste Queru [Mon, 11 Mar 2013 19:35:36 +0000 (12:35 -0700)]
am
b2525ba8: am
7915b22e: am
a4b20d71: am
b8e1033c: (-s ours) am
e5412a9a: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
b2525ba8a0f91594df17e893d036c416a109b012':
Elliott Hughes [Mon, 11 Mar 2013 19:34:11 +0000 (19:34 +0000)]
am
60ac09bd: am
6d6f5e61: am
4b032ee9: Merge "Let bionic use the correct definition of ssize_t."
* commit '
60ac09bdb2ddc4076f78a91f260cd5a1e179c82b':
Let bionic use the correct definition of ssize_t.
Jean-Baptiste Queru [Mon, 11 Mar 2013 19:30:58 +0000 (12:30 -0700)]
am
7915b22e: am
a4b20d71: am
b8e1033c: (-s ours) am
e5412a9a: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
7915b22e8f70b80a9fc2c41f9734194c58b546fc':
Jean-Baptiste Queru [Mon, 11 Mar 2013 19:28:17 +0000 (12:28 -0700)]
am
a4b20d71: am
b8e1033c: (-s ours) am
e5412a9a: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
a4b20d712b9c6cbc562529d3a41bf8ea1515562a':
Elliott Hughes [Mon, 11 Mar 2013 19:27:58 +0000 (12:27 -0700)]
am
6d6f5e61: am
4b032ee9: Merge "Let bionic use the correct definition of ssize_t."
* commit '
6d6f5e618e054e79d80a02f2c3f76ce0fd73bb2a':
Let bionic use the correct definition of ssize_t.
Jean-Baptiste Queru [Mon, 11 Mar 2013 19:22:41 +0000 (12:22 -0700)]
am
b8e1033c: (-s ours) am
e5412a9a: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
b8e1033c5b5813cb97d19645075591a357e9f04a':
Jean-Baptiste Queru [Mon, 11 Mar 2013 19:19:03 +0000 (12:19 -0700)]
am
e5412a9a: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
e5412a9a9597433ae2540b390269c514c46402f1':
Jean-Baptiste Queru [Mon, 11 Mar 2013 19:15:11 +0000 (12:15 -0700)]
Reconcile with jb-mr1-release - do not merge
Elliott Hughes [Mon, 11 Mar 2013 18:39:13 +0000 (18:39 +0000)]
am
022d7c50: am
bf32ffcf: am
0b765862: am
62c5cd07: Merge "Upgrade to tzdata2013b."
* commit '
022d7c50db28fbf90e197f0c88b23b7e3a74a07b':
Upgrade to tzdata2013b.
Elliott Hughes [Mon, 11 Mar 2013 18:33:57 +0000 (18:33 +0000)]
am
bf32ffcf: am
0b765862: am
62c5cd07: Merge "Upgrade to tzdata2013b."
* commit '
bf32ffcf027d0089e84fafb0114f6b40825f84ac':
Upgrade to tzdata2013b.
Elliott Hughes [Mon, 11 Mar 2013 18:29:24 +0000 (11:29 -0700)]
am
0b765862: am
62c5cd07: Merge "Upgrade to tzdata2013b."
* commit '
0b765862e134e87174ddf9bdfa32528392f85e96':
Upgrade to tzdata2013b.
Elliott Hughes [Mon, 11 Mar 2013 18:07:29 +0000 (11:07 -0700)]
am
4b032ee9: Merge "Let bionic use the correct definition of ssize_t."
* commit '
4b032ee9b94137e41ee54e9bb3bcf0ba5ad43cbc':
Let bionic use the correct definition of ssize_t.
Elliott Hughes [Mon, 11 Mar 2013 17:55:27 +0000 (17:55 +0000)]
Merge "Let bionic use the correct definition of ssize_t."
Elliott Hughes [Mon, 11 Mar 2013 16:57:53 +0000 (09:57 -0700)]
am
62c5cd07: Merge "Upgrade to tzdata2013b."
* commit '
62c5cd0781e95c1c50b63c37a9a87bc158e64d38':
Upgrade to tzdata2013b.
Elliott Hughes [Mon, 11 Mar 2013 16:42:57 +0000 (16:42 +0000)]
Merge "Upgrade to tzdata2013b."
Elliott Hughes [Mon, 11 Mar 2013 16:41:45 +0000 (09:41 -0700)]
Upgrade to tzdata2013b.
From the release notes:
Changes affecting current and future time stamps:
Haiti uses US daylight-saving rules this year, and presumably future years.
This changes time stamps starting today. (Thanks to Steffen Thorsen.)
Paraguay will end DST on March 24 this year.
(Thanks to Steffen Thorsen.) For now, assume it's just this year.
Morocco does not observe DST during Ramadan;
try to predict Ramadan in Morocco as best we can.
(Thanks to Erik Homoet for the heads-up.)
Change-Id: I98d5290ea5a1d9fb1eeddab1c9e72135dc9e4bd1
The Android Automerger [Mon, 11 Mar 2013 12:55:24 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Elliott Hughes [Fri, 8 Mar 2013 23:28:52 +0000 (15:28 -0800)]
Let bionic use the correct definition of ssize_t.
Bug:
8253769
Change-Id: I50c7cc20828fc089b83580e039ce9153a6c5a8cc
Elliott Hughes [Thu, 7 Mar 2013 21:25:35 +0000 (21:25 +0000)]
am
7a9749ec: am
8a015722: resolved conflicts for merge of
4706606c to jb-mr2-dev
* commit '
7a9749eca06816ba3b63e55660bc1c2b7285dc52':
Regenerate NOTICE files.
Elliott Hughes [Thu, 7 Mar 2013 21:23:22 +0000 (21:23 +0000)]
am
8a015722: resolved conflicts for merge of
4706606c to jb-mr2-dev
* commit '
8a0157227242eeb7917f064e0d81014bcda6d8f7':
Regenerate NOTICE files.
Elliott Hughes [Thu, 7 Mar 2013 21:19:20 +0000 (13:19 -0800)]
resolved conflicts for merge of
4706606c to jb-mr2-dev
Change-Id: Ibf6340df901c870cd05a2ab56536ad23b6fd491c
Elliott Hughes [Thu, 7 Mar 2013 20:02:00 +0000 (12:02 -0800)]
am
809eed1d: Merge "Regenerate NOTICE files."
* commit '
809eed1dedb833af1aba56c6a1d059123b43049a':
Regenerate NOTICE files.
Elliott Hughes [Thu, 7 Mar 2013 19:57:17 +0000 (19:57 +0000)]
Merge "Regenerate NOTICE files."
Elliott Hughes [Thu, 7 Mar 2013 19:48:58 +0000 (11:48 -0800)]
Regenerate NOTICE files.
Also clean up some obsolete cruft.
Change-Id: Iec3b36f6607f7a08b72de99294ed5b6cd910dd5f
The Android Automerger [Thu, 7 Mar 2013 13:55:07 +0000 (05:55 -0800)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Elliott Hughes [Thu, 7 Mar 2013 01:09:36 +0000 (01:09 +0000)]
am
0f644ccf: am
0a2ee475: am
ad7c275e: am
c9f80814: Merge "Upgrade to current NetBSD popen/pclose."
* commit '
0f644ccf6dfb4f00473fc90f369d842e09ab13df':
Upgrade to current NetBSD popen/pclose.