Robert Ly
0c196f9a77
am 993c70d3: am 85755fae: am 7a98345f: updating the SampleSyncAdapter sample to add stream item and photo code
...
* commit '993c70d3fad09e6827017e87abfcb286c1a964d8':
updating the SampleSyncAdapter sample to add stream item and photo code
2012-01-20 16:43:17 -08:00
Robert Ly
993c70d3fa
am 85755fae: am 7a98345f: updating the SampleSyncAdapter sample to add stream item and photo code
...
* commit '85755fae3bda06e94e1d191c20c70e5344293b9a':
updating the SampleSyncAdapter sample to add stream item and photo code
2012-01-20 16:37:56 -08:00
The Android Open Source Project
f25db23f45
am a91b32c1: am 113986be: Reconcile with ics-mr1-release
...
* commit 'a91b32c1d71d8cac75917d35d6263e74916806f6':
2012-01-20 15:54:41 -08:00
Dianne Hackborn
4497b29f6f
am 37e103ca: am 5370dc8f: am 2a9de021: Clean up and extend the linkify sample.
...
* commit '37e103caf5f0264fb84fc25174661bf74c6c4715':
Clean up and extend the linkify sample.
2012-01-20 15:54:40 -08:00
The Android Open Source Project
a91b32c1d7
am 113986be: Reconcile with ics-mr1-release
...
* commit '113986be4f8bc71da5d30520bb7095b70eeb72d5':
2012-01-20 15:52:15 -08:00
Dianne Hackborn
37e103caf5
am 5370dc8f: am 2a9de021: Clean up and extend the linkify sample.
...
* commit '5370dc8f0dc20a46302f823af38cb48d08de1c45':
Clean up and extend the linkify sample.
2012-01-20 15:52:04 -08:00
Robert Ly
85755fae3b
am 7a98345f: updating the SampleSyncAdapter sample to add stream item and photo code
...
* commit '7a98345fc5229a23b4490713991f78170374dd11':
updating the SampleSyncAdapter sample to add stream item and photo code
2012-01-20 10:21:38 -08:00
Robert Ly
7a98345fc5
updating the SampleSyncAdapter sample to add stream item and photo code
...
Change-Id: I6d44ea3f912a3d1e52695bda785c81ff527160d5
2012-01-19 14:51:23 -08:00
The Android Open Source Project
113986be4f
Reconcile with ics-mr1-release
...
Change-Id: I169da9f82d60659a6a8a4969571e46c65a12e23d
2012-01-19 13:06:34 -08:00
Dianne Hackborn
5370dc8f0d
am 2a9de021: Clean up and extend the linkify sample.
...
* commit '2a9de0211d7f8c5cb6f4dfb3d0eb5baddb355f2f':
Clean up and extend the linkify sample.
2012-01-19 10:12:54 -08:00
Dianne Hackborn
2a9de0211d
Clean up and extend the linkify sample.
...
Change-Id: If9d0451af3bfcdcd8bafb325f4b7978857efab7e
2012-01-13 14:00:01 -08:00
Fred Quintana
dd18180210
am 9ce19670: Merge "fix the layout oddness that occurrs in portrait mode"
...
* commit '9ce19670b2f2537304a33abbf062c0b92dd91da0':
fix the layout oddness that occurrs in portrait mode
2012-01-12 18:09:03 -08:00
Fred Quintana
9ce19670b2
Merge "fix the layout oddness that occurrs in portrait mode"
2012-01-12 18:07:07 -08:00
Fred Quintana
70c13b1957
fix the layout oddness that occurrs in portrait mode
...
Change-Id: I42bb7479671c99220215cfc63d56d926baece10f
2012-01-12 16:57:38 -08:00
The Android Automerger
c9011c7f3c
merge in ics-mr1-release history after reset to ics-mr1
2012-01-12 14:00:47 -08:00
The Android Open Source Project
297c6a1c1a
am 771d0f06: am 88f46420: Reconcile with ics-mr1-release
...
* commit '771d0f06fa0dc616411fcf079ac6610589b7a059':
2012-01-12 08:59:44 -08:00
The Android Open Source Project
771d0f06fa
am 88f46420: Reconcile with ics-mr1-release
...
* commit '88f4642092e394631ea6e749130fc09286265970':
2012-01-12 08:58:05 -08:00
The Android Open Source Project
88f4642092
Reconcile with ics-mr1-release
...
Change-Id: I881c64731cf66f630d0062e8b1f87bc9c3dfb5a9
2012-01-12 08:56:08 -08:00
Jesse Hall
97c1620440
am 900f5e87: am 9b19d582: am 4f66a14d: Merge "EmuGL: handle NULL data in glBufferData" into ics-mr1
...
* commit '900f5e879360898afc5599fc887b98aa012c8ce2':
EmuGL: handle NULL data in glBufferData
2012-01-11 17:15:50 -08:00
Xavier Ducrohet
f35fcdde38
am c7845885: am 3393b3ae: (-s ours) am a318515c: Merge "Move platform 15 sdk rev to 2. do not merge." into ics-mr1
...
* commit 'c784588597a9f620bc10da3e1c02ca2a8df021f6':
Move platform 15 sdk rev to 2. do not merge.
2012-01-11 17:14:07 -08:00
Jesse Hall
900f5e8793
am 9b19d582: am 4f66a14d: Merge "EmuGL: handle NULL data in glBufferData" into ics-mr1
...
* commit '9b19d582d94a343437aacf962b8b95b83361bc10':
EmuGL: handle NULL data in glBufferData
2012-01-11 17:13:42 -08:00
Jesse Hall
9b19d582d9
am 4f66a14d: Merge "EmuGL: handle NULL data in glBufferData" into ics-mr1
...
* commit '4f66a14d5311ee94d5a498c8e0049f6b95d4d0d6':
EmuGL: handle NULL data in glBufferData
2012-01-11 17:12:09 -08:00
Xavier Ducrohet
c784588597
am 3393b3ae: (-s ours) am a318515c: Merge "Move platform 15 sdk rev to 2. do not merge." into ics-mr1
...
* commit '3393b3ae2b550bc47dc267e5f365f8a34c274da3':
Move platform 15 sdk rev to 2. do not merge.
2012-01-11 17:11:59 -08:00
Jesse Hall
4f66a14d53
Merge "EmuGL: handle NULL data in glBufferData" into ics-mr1
2012-01-11 17:10:35 -08:00
Xavier Ducrohet
3393b3ae2b
am a318515c: Merge "Move platform 15 sdk rev to 2. do not merge." into ics-mr1
...
* commit 'a318515c0d160122313a8e87d9002d957e8789b6':
Move platform 15 sdk rev to 2. do not merge.
2012-01-11 17:10:27 -08:00
Xavier Ducrohet
a318515c0d
Merge "Move platform 15 sdk rev to 2. do not merge." into ics-mr1
2012-01-11 17:08:47 -08:00
Xavier Ducrohet
e4627619b3
Move platform 15 sdk rev to 2. do not merge.
...
Change-Id: I8c3ab6cce4305afcd380b23ed0638169676d5d97
2012-01-11 17:08:18 -08:00
The Android Automerger
c8b86c1add
merge in ics-mr1-release history after reset to ics-mr1
2012-01-11 16:28:10 -08:00
Katie McCormick
71f9a53def
am 6588fb68: am 811d1dd3: am e065fd62: Merge "Doc change: updated index page for HDP sample." into ics-mr1
...
* commit '6588fb68eca45b8a6872b0f82eaffcbf8375a6c7':
Doc change: updated index page for HDP sample.
2012-01-11 16:09:40 -08:00
Katie McCormick
6588fb68ec
am 811d1dd3: am e065fd62: Merge "Doc change: updated index page for HDP sample." into ics-mr1
...
* commit '811d1dd339adc9f005d34611ffbf0d4ded4c9fa8':
Doc change: updated index page for HDP sample.
2012-01-11 16:07:33 -08:00
Katie McCormick
811d1dd339
am e065fd62: Merge "Doc change: updated index page for HDP sample." into ics-mr1
...
* commit 'e065fd6209926814df312623a2a8230518e738c0':
Doc change: updated index page for HDP sample.
2012-01-11 16:05:06 -08:00
Katie McCormick
e065fd6209
Merge "Doc change: updated index page for HDP sample." into ics-mr1
2012-01-11 16:02:50 -08:00
Jesse Hall
5bad48a65e
EmuGL: handle NULL data in glBufferData
...
The data pointer argument to glBufferData can be NULL; this
[re]allocates the buffer while leaving the contents undefined.
Bug: 5833436
Change-Id: Ia1ddf62e2cd2c59d3d631e01d23d7c557ca5a52e
2012-01-11 15:40:29 -08:00
Dianne Hackborn
3374f30c50
am d2f0e466: am 2492079b: am 0b6b4f2d: Merge "Fix notification sample to follow current UI guidelines." into ics-mr1
...
* commit 'd2f0e4667fd096094d8a4ea4f4f25db1a23675ad':
Fix notification sample to follow current UI guidelines.
2012-01-11 10:59:14 -08:00
Dianne Hackborn
d2f0e4667f
am 2492079b: am 0b6b4f2d: Merge "Fix notification sample to follow current UI guidelines." into ics-mr1
...
* commit '2492079bb859b689adc1ff5504bfc274a9ba07ee':
Fix notification sample to follow current UI guidelines.
2012-01-11 10:56:42 -08:00
Dianne Hackborn
2492079bb8
am 0b6b4f2d: Merge "Fix notification sample to follow current UI guidelines." into ics-mr1
...
* commit '0b6b4f2d195f8224e19b66e5c266a7fd798f321d':
Fix notification sample to follow current UI guidelines.
2012-01-11 10:54:42 -08:00
Dianne Hackborn
0b6b4f2d19
Merge "Fix notification sample to follow current UI guidelines." into ics-mr1
2012-01-11 10:53:25 -08:00
David 'Digit' Turner
38b63f3f28
am af4519e9: ndk: Fix ipv6 related headers
...
* commit 'af4519e9537c17cebc23b8e7b67a83dcfc6ee495':
ndk: Fix ipv6 related headers
2012-01-11 09:16:24 -08:00
David 'Digit' Turner
af4519e953
ndk: Fix ipv6 related headers
...
This fixes two minor issues with recent updates to the IPv6 related headers:
- add missing <linux/ipv6.h> kernel header
- avoid conflict in netinet/in6.h, the macro is already defined by <linux/in6.h>
Change-Id: Ibd0d44fd801affc6ca405e96982a73f9a630bdba
2012-01-11 17:36:09 +01:00
David 'Digit' Turner
2b88e703f8
am e56aece8: ndk: API level 14: Add C library symbol files
...
* commit 'e56aece818523fb34969cb09d61e15b89fa1efae':
ndk: API level 14: Add C library symbol files
2012-01-11 06:59:16 -08:00
David 'Digit' Turner
1b57e10d06
am c8357964: ndk: API level 12: Add ARM libc symbol files
...
* commit 'c8357964fced62cef1138d77c11469c84020fc51':
ndk: API level 12: Add ARM libc symbol files
2012-01-11 06:59:16 -08:00
David 'Digit' Turner
e02e891a7b
am 7d8f5ae2: ndk: API level 11: Add libc.so + libm.so symbol files
...
* commit '7d8f5ae269659360058cf0df51ed47f72fb6d6d4':
ndk: API level 11: Add libc.so + libm.so symbol files
2012-01-11 06:59:15 -08:00
David 'Digit' Turner
e56aece818
ndk: API level 14: Add C library symbol files
...
Symbols for both arm and x86.
+ missing declarations for getpwnam_r and getpwuid_r which were implemented
in Android 4.0.1. This didn't appear in previous comparison because the
platform header always declare these in <pwd.h>, so it never changed
when the functions were added. They appear in libc.so.functions.txt though.
The arm symbols are generated from the library files extracted from the
'yakju' platform build for 4.0.1 a.k.a. ITL41D.
The x86 symbols are generated by building the corresponding libraries
for the full_x86-eng product, using the same Bionic sources.
+ x86: Add missing symbols for "siglongjmp" and "sigsetjmp" which are not
exported by the gingerbread version of full_x86-eng libc.so. This was
checked with a fresh build of the product from the current gingerbread
tree on the AOSP server. Probably a bug, but a minor one.
Change-Id: I41d3eb28cecc1989e1bec4a00ac236c4b262c2be
2012-01-11 15:55:11 +01:00
David 'Digit' Turner
c8357964fc
ndk: API level 12: Add ARM libc symbol files
...
Extracted from the tervigon build for android-3.1_r1 a.k.a. HMJ37
Change-Id: Idd914b3a4879174f98569b3a9bbb6cf3d48ef221
2012-01-11 15:53:50 +01:00
David 'Digit' Turner
7d8f5ae269
ndk: API level 11: Add libc.so + libm.so symbol files
...
Only for arm, since oneycomb isn't supported on x86
(i.e. API levels 11 to 13).
Change-Id: I662400ed7e222ea070dd1f9f6681c21971b589e1
ndk: API level 11: Add libm.so symbols for ARM
Change-Id: I5688b57557ad7021d49f458e1b9519e8800d795e
2012-01-11 15:48:37 +01:00
David 'Digit' Turner
07d1c4d53a
am 485ea2e3: ndk: <sys/stat.h>: Add utimensat() to API level 12
...
* commit '485ea2e3d26c4c107c01380ecba5ad33ed6521b2':
ndk: <sys/stat.h>: Add utimensat() to API level 12
2012-01-11 02:45:17 -08:00
David 'Digit' Turner
e2c5a3df6d
am a58e7602: ndk: arm: Update <asm/ptrace.h> and <asm/user.h>
...
* commit 'a58e7602fe5cb6fe7eacb777753f39e4caa6ef0d':
ndk: arm: Update <asm/ptrace.h> and <asm/user.h>
2012-01-11 02:43:36 -08:00
David 'Digit' Turner
ce4b2e129f
am 21fc12da: ndk: libc: Add RLIM_RTTIME to <asm-generic/resource.h>
...
* commit '21fc12da17a47d3fd16803fa05d95a519fae48b7':
ndk: libc: Add RLIM_RTTIME to <asm-generic/resource.h>
2012-01-11 02:43:35 -08:00
David 'Digit' Turner
4e16ed6865
am fe012f59: ndk: <dlfcn.h>: dladdr() takes a \'const void*\' parameter, not \'void*\'
...
* commit 'fe012f597f0055956c51ea9196b8b3f0c57b6c24':
ndk: <dlfcn.h>: dladdr() takes a 'const void*' parameter, not 'void*'
2012-01-11 02:43:35 -08:00
David 'Digit' Turner
1992a08905
am 8e286273: ndk: <wchar.h>: Add wcscasecmp and wcsncasecmp for API level 11
...
* commit '8e2862730a332113bfd8647313925ba377ce1c74':
ndk: <wchar.h>: Add wcscasecmp and wcsncasecmp for API level 11
2012-01-11 02:43:34 -08:00