LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,816 Commits 2 Branches 0 Tags
f06ece3a645c071ade65b175cd022e0b26ea37a7
Commit Graph

8816 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Open Source Project
a31a63e5c7 am 04b76422: am 3407aafe: Reconcile with ics-mr1-release 
* commit '04b764227c8bcdabdd7faf82bc905422204ff187':
 2012-01-20 16:43:18 -08:00
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
9dc9cff102 am b295c347: am 3d398d72: Revert "updating the SampleSyncAdapter sample to add stream item and photo code" 
* commit 'b295c347f44b2390f44bdbaffdd1c37ab19cc2ff':
  Revert "updating the SampleSyncAdapter sample to add stream item and photo code"
 2012-01-20 16:38:03 -08:00
The Android Open Source Project
04b764227c am 3407aafe: Reconcile with ics-mr1-release 
* commit '3407aafede66786616436dff0c448a77746f60aa':
 2012-01-20 16:37:57 -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
Andy McFadden
0da366d78a Use Map.Entry, not LinkedHashMap.Entry 
Map.Entry is the defined return value from entrySet().
LinkedHashMap.Entry shouldn't be used directly.

Change-Id: Ib23ceac365c85cdec6ab1688e8f8168ce882bc90
 2012-01-20 14:38:08 -08:00
Robert Ly
b295c347f4 am 3d398d72: Revert "updating the SampleSyncAdapter sample to add stream item and photo code" 
* commit '3d398d7243fece134e677480899437880a9259ed':
  Revert "updating the SampleSyncAdapter sample to add stream item and photo code"
 2012-01-20 11:13:33 -08:00
Robert Ly
3d398d7243 Revert "updating the SampleSyncAdapter sample to add stream item and photo code" 
This reverts commit 7a98345fc5
 2012-01-20 11:07:10 -08:00
The Android Open Source Project
3407aafede Reconcile with ics-mr1-release 
Change-Id: I125a7243c23acb8c9268fcdab4ad953df8532844
 2012-01-20 10:25:24 -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
The Android Automerger
deda7c815c merge in ics-mr1-release history after reset to ics-mr1 2012-01-19 16:28:01 -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