The Android Open Source Project
b6f947238f
Reconcile with ics-mr1-release
...
Change-Id: I846571d58584c9f58a20e8c9d1b144a93801c834
2012-02-16 10:14:42 -08:00
The Android Open Source Project
5c74008434
am c263b345: Reconcile with ics-mr1-release
...
* commit 'c263b3450fc291f367eb277e73b2b70060834707':
2012-02-16 10:11:49 -08:00
The Android Open Source Project
c263b3450f
Reconcile with ics-mr1-release
...
Change-Id: Ibf45e3ef58ab7a50e362da85993c4332636f32f7
2012-02-16 10:10:08 -08:00
Xavier Ducrohet
3837d4581e
am ae0c9dfd: am 52feec59: Update rev numbers of SDK packages. DO NOT MERGE.
...
* commit 'ae0c9dfd62619a2dec14291b4e292566beb008e5':
2012-02-16 09:58:27 -08:00
Xavier Ducrohet
b0069f5644
am aa55fa50: am 52feec59: Update rev numbers of SDK packages. DO NOT MERGE.
...
* commit 'aa55fa5061d768438506a5065700cefab539119f':
Update rev numbers of SDK packages. DO NOT MERGE.
2012-02-16 09:57:16 -08:00
Xavier Ducrohet
ae0c9dfd62
am 52feec59: Update rev numbers of SDK packages. DO NOT MERGE.
...
* commit '52feec594a769653625f6089cfcd5398332922ea':
Update rev numbers of SDK packages. DO NOT MERGE.
2012-02-16 09:56:04 -08:00
Xavier Ducrohet
aa55fa5061
am 52feec59: Update rev numbers of SDK packages. DO NOT MERGE.
...
* commit '52feec594a769653625f6089cfcd5398332922ea':
Update rev numbers of SDK packages. DO NOT MERGE.
2012-02-16 09:55:44 -08:00
Xavier Ducrohet
52feec594a
Update rev numbers of SDK packages. DO NOT MERGE.
...
Change-Id: Idc750d5bd63186157cd2cb08c28e73e9894c34bd
2012-02-15 18:32:11 -08:00
Jean-Baptiste Queru
0f043b53fe
am 2ea5b27e: am 96a4c245: am 5539b1bf: Merge "Merge "Projects whitelisted for Windows SDK compilation.""
...
* commit '2ea5b27ef56cb5666dabd09aec2289b3d80ad6ad':
Merge "Projects whitelisted for Windows SDK compilation."
2012-02-14 16:25:15 -08:00
Jean-Baptiste Queru
2ea5b27ef5
am 96a4c245: am 5539b1bf: Merge "Merge "Projects whitelisted for Windows SDK compilation.""
...
* commit '96a4c2452e0f671abf3d66c6dfd9ac75f7105f70':
Merge "Projects whitelisted for Windows SDK compilation."
2012-02-14 14:54:27 -08:00
Jean-Baptiste Queru
96a4c2452e
am 5539b1bf: Merge "Merge "Projects whitelisted for Windows SDK compilation.""
...
* commit '5539b1bf6be817b538e9490c826151415f445081':
Merge "Projects whitelisted for Windows SDK compilation."
2012-02-14 14:51:40 -08:00
The Android Automerger
d16ed56822
merge in ics-mr1-release history after reset to ics-mr1
2012-02-14 14:14:35 -08:00
Jean-Baptiste Queru
5539b1bf6b
Merge "Merge "Projects whitelisted for Windows SDK compilation.""
2012-02-14 13:02:09 -08:00
Raphael Moll
f06c958f3c
Merge "Projects whitelisted for Windows SDK compilation."
...
This replaces the list maintained in build/core/main.mk
There's a similar change in sdk.git at Change Ifa8111dbae
(cherry-pick of 2b53ba5897
2012-02-14 11:11:06 -08:00
Jean-Baptiste Queru
077e4bb882
am 44039c68: am f987c05c: am 9ce69a5f: Merge "Make sure __u64 is defined even for strict ansi or -std=c99"
...
* commit '44039c689e0f117cc581c434e068436a044baa9e':
Make sure __u64 is defined even for strict ansi or -std=c99
2012-02-13 14:39:56 -08:00
Adam Powell
bd4ed96061
am 58589851: am 15a14930: Merge "Add AppNavigation demo" into ics-mr1
...
* commit '58589851a68a3769e633f34e0fdc7c8d742f86da':
2012-02-13 14:39:54 -08:00
Adam Powell
404be3bd4c
am 1b919a3f: am 15a14930: Merge "Add AppNavigation demo" into ics-mr1
...
* commit '1b919a3fb80350a6ff1857c5c3d94d86766c0555':
Add AppNavigation demo
2012-02-13 14:32:00 -08:00
Jean-Baptiste Queru
44039c689e
am f987c05c: am 9ce69a5f: Merge "Make sure __u64 is defined even for strict ansi or -std=c99"
...
* commit 'f987c05c776918d121b7e2095a232e4854fde8a8':
Make sure __u64 is defined even for strict ansi or -std=c99
2012-02-13 14:29:58 -08:00
Adam Powell
1b919a3fb8
am 15a14930: Merge "Add AppNavigation demo" into ics-mr1
...
* commit '15a14930d761d85466faf4e5f62209e8ab078b1d':
Add AppNavigation demo
2012-02-13 14:29:49 -08:00
Adam Powell
58589851a6
am 15a14930: Merge "Add AppNavigation demo" into ics-mr1
...
* commit '15a14930d761d85466faf4e5f62209e8ab078b1d':
Add AppNavigation demo
2012-02-13 14:29:19 -08:00
Adam Powell
15a14930d7
Merge "Add AppNavigation demo" into ics-mr1
2012-02-13 14:27:58 -08:00
Jean-Baptiste Queru
f987c05c77
am 9ce69a5f: Merge "Make sure __u64 is defined even for strict ansi or -std=c99"
...
* commit '9ce69a5f9fc1e5e4efb19b708c9aa91cfd0969db':
Make sure __u64 is defined even for strict ansi or -std=c99
2012-02-13 14:27:33 -08:00
Jean-Baptiste Queru
9ce69a5f9f
Merge "Make sure __u64 is defined even for strict ansi or -std=c99"
2012-02-13 14:24:04 -08:00
Scott Main
0db4faddb9
am 12104d37: am de797a2f: Merge "docs: fix minsdkversion for native activity sample" into ics-mr1
...
* commit '12104d3734421ca9234c3c1933fa33c239329a48':
2012-02-09 12:18:59 -08:00
Scott Main
90d9ce81d0
am e4fd5043: am de797a2f: Merge "docs: fix minsdkversion for native activity sample" into ics-mr1
...
* commit 'e4fd504325a0d3b1f3a82940a6b5300679b5e574':
docs: fix minsdkversion for native activity sample
2012-02-09 12:18:44 -08:00
Scott Main
e4fd504325
am de797a2f: Merge "docs: fix minsdkversion for native activity sample" into ics-mr1
...
* commit 'de797a2fb233ce1aed1eedb9cfc629ba63bd9bd7':
docs: fix minsdkversion for native activity sample
2012-02-09 12:16:42 -08:00
Scott Main
12104d3734
am de797a2f: Merge "docs: fix minsdkversion for native activity sample" into ics-mr1
...
* commit 'de797a2fb233ce1aed1eedb9cfc629ba63bd9bd7':
docs: fix minsdkversion for native activity sample
2012-02-09 12:16:41 -08:00
Scott Main
de797a2fb2
Merge "docs: fix minsdkversion for native activity sample" into ics-mr1
2012-02-09 12:15:07 -08:00
Scott Main
41b5bb95c3
docs: fix minsdkversion for native activity sample
...
Change-Id: I2d45207182f6a5b1743b574f7ab10251efd3a17a
2012-02-09 12:10:27 -08:00
Adam Powell
247df4fe79
Add AppNavigation demo
...
This demo illustrates the use of the new support library functionality
for navigating within and across tasks using "up" navigation. This
matches the recommendations in the Android design guide.
Change-Id: I2b36c962dd24f0e0f3b3ee3f86319dafc2fc66e2
2012-02-07 15:02:57 -08:00
Jesse Hall
808669519a
am bc96fa33: am 0e981c83: EmuGL: Fix heap corruption
...
* commit 'bc96fa33dc4dcac2bcb27d9ed2488f5815c88704':
2012-02-06 13:38:32 -08:00
Jesse Hall
165c21e84c
am 1276f7ba: am 0e981c83: EmuGL: Fix heap corruption
...
* commit '1276f7ba042be1d54e56c432f0cb89c4164f266c':
EmuGL: Fix heap corruption
2012-02-06 13:37:39 -08:00
Jesse Hall
bc96fa33dc
am 0e981c83: EmuGL: Fix heap corruption
...
* commit '0e981c83041878e6a05b0a996879160fd0f320cf':
EmuGL: Fix heap corruption
2012-02-06 13:36:49 -08:00
Jesse Hall
1276f7ba04
am 0e981c83: EmuGL: Fix heap corruption
...
* commit '0e981c83041878e6a05b0a996879160fd0f320cf':
EmuGL: Fix heap corruption
2012-02-06 13:36:19 -08:00
Jesse Hall
0e981c8304
EmuGL: Fix heap corruption
...
Off-by-two bug when removing textures from the tracking array could
overwrite malloc's mem chunk data structure, usually resulting in a
heap corruption abort on a later malloc/realloc/free.
Bug: 5951738
Change-Id: I11056bb62883373c2a3403f53899347ff8cdabf2
2012-02-03 22:54:24 -08:00
Trevor Johns
f97ce5b3cb
am b8504b0a: am 47365074: Merge "Adding Android Developers Google+ redirect" into ics-mr1
...
* commit 'b8504b0a0e18575c38fa849c210e22b2dcc18097':
2012-02-03 13:13:15 -08:00
Trevor Johns
39107cac7b
am 7b8f2c59: am 47365074: Merge "Adding Android Developers Google+ redirect" into ics-mr1
...
* commit '7b8f2c59cd04521951c431228b765840dbb334dc':
Adding Android Developers Google+ redirect
2012-02-03 13:12:39 -08:00
Trevor Johns
c5b0ae26c9
am 87f81a89: am 7a94a9dc: Merge "Adding manual redirect support to developer.android.com." into ics-mr1
...
* commit '87f81a89f4b1912715aef02e70bc0af10b34909b':
2012-02-03 13:12:38 -08:00
Trevor Johns
b8504b0a0e
am 47365074: Merge "Adding Android Developers Google+ redirect" into ics-mr1
...
* commit '47365074a01acc1826e10cf530f613e4cd58d62a':
Adding Android Developers Google+ redirect
2012-02-03 13:11:31 -08:00
Trevor Johns
b0d9d37520
am 23195b75: am 7a94a9dc: Merge "Adding manual redirect support to developer.android.com." into ics-mr1
...
* commit '23195b75a42cf192867fa03de5160f357b7a87ad':
Adding manual redirect support to developer.android.com.
2012-02-03 13:11:29 -08:00
Trevor Johns
7b8f2c59cd
am 47365074: Merge "Adding Android Developers Google+ redirect" into ics-mr1
...
* commit '47365074a01acc1826e10cf530f613e4cd58d62a':
Adding Android Developers Google+ redirect
2012-02-03 13:10:20 -08:00
Trevor Johns
87f81a89f4
am 7a94a9dc: Merge "Adding manual redirect support to developer.android.com." into ics-mr1
...
* commit '7a94a9dc49fc9b512e30fc5737baed8d1ddc7d13':
Adding manual redirect support to developer.android.com.
2012-02-03 13:10:20 -08:00
Trevor Johns
23195b75a4
am 7a94a9dc: Merge "Adding manual redirect support to developer.android.com." into ics-mr1
...
* commit '7a94a9dc49fc9b512e30fc5737baed8d1ddc7d13':
Adding manual redirect support to developer.android.com.
2012-02-03 13:09:43 -08:00
Trevor Johns
47365074a0
Merge "Adding Android Developers Google+ redirect" into ics-mr1
2012-02-03 13:08:46 -08:00
Trevor Johns
7a94a9dc49
Merge "Adding manual redirect support to developer.android.com." into ics-mr1
2012-02-03 13:08:23 -08:00
Trevor Johns
22f4efaa12
Adding Android Developers Google+ redirect
...
Redirect developer.android.com/+ to Google+ page for Android Developers.
Issue: 5933956
Change-Id: I0ed2b076386058f1ac81ea4376aea15fee6b24aa
2012-02-03 12:32:10 -08:00
Xavier Ducrohet
a6ebde0323
am eea4e8e8: am df458cb8: Fix api version file with proper data enum.
...
* commit 'eea4e8e803aeb2a0719f6614f02211a45dd7820c':
2012-02-01 13:57:02 -08:00
Xavier Ducrohet
eea4e8e803
am df458cb8: Fix api version file with proper data enum.
...
* commit 'df458cb83274782a7908333ae2f21a1860a12400':
Fix api version file with proper data enum.
2012-02-01 13:52:22 -08:00
Xavier Ducrohet
8a01c6a267
am c90d4c8a: am df458cb8: Fix api version file with proper data enum.
...
* commit 'c90d4c8a09637fd05a9e06d0676ef8c8855afb6c':
Fix api version file with proper data enum.
2012-02-01 13:49:26 -08:00
Xavier Ducrohet
c90d4c8a09
am df458cb8: Fix api version file with proper data enum.
...
* commit 'df458cb83274782a7908333ae2f21a1860a12400':
Fix api version file with proper data enum.
2012-02-01 13:47:16 -08:00
