Scott Main
2d74b81e52
am 856545fb: am 0db4fadd: am 12104d37: am de797a2f: Merge "docs: fix minsdkversion for native activity sample" into ics-mr1
...
* commit '856545fbf9edcfd053605f032c670ca36d58ed4b':
2012-02-09 12:22:53 -08:00
Scott Main
0fbcef5403
am e1b0a27c: am 90d9ce81: am e4fd5043: am de797a2f: Merge "docs: fix minsdkversion for native activity sample" into ics-mr1
...
* commit 'e1b0a27c90f1366ab22d673cd0d18da057e6b0d1':
docs: fix minsdkversion for native activity sample
2012-02-09 12:22:51 -08:00
Scott Main
856545fbf9
am 0db4fadd: am 12104d37: am de797a2f: Merge "docs: fix minsdkversion for native activity sample" into ics-mr1
...
* commit '0db4faddb998ed3e20c698eea96aa907e9a7e294':
2012-02-09 12:20:45 -08:00
Scott Main
e1b0a27c90
am 90d9ce81: am e4fd5043: am de797a2f: Merge "docs: fix minsdkversion for native activity sample" into ics-mr1
...
* commit '90d9ce81d0c35b282d48b77b8e7b8466bd758a7a':
docs: fix minsdkversion for native activity sample
2012-02-09 12:20:44 -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
Dianne Hackborn
95b4aa9750
am 37f02d80: New API demo for isolated processes.
...
* commit '37f02d80427e9520052bd670c468bda91eece395':
New API demo for isolated processes.
2012-02-09 11:22:14 -08:00
Dianne Hackborn
37f02d8042
New API demo for isolated processes.
...
Change-Id: I2b2117ae5e5005bfffe8d89df5e06cee32da603c
2012-02-09 10:51:07 -08:00
Eino-Ville Talvala
ab66cdf687
am 86fa7ead: Merge "Add cleaned-up filter framework, camera, gallery back to .classpath"
...
* commit '86fa7ead3f798379190a8b46ce468c6bf67f495a':
Add cleaned-up filter framework, camera, gallery back to .classpath
2012-02-08 11:28:39 -08:00
Eino-Ville Talvala
86fa7ead3f
Merge "Add cleaned-up filter framework, camera, gallery back to .classpath"
2012-02-08 11:08:02 -08:00
Eino-Ville Talvala
8f3f77f20c
Add cleaned-up filter framework, camera, gallery back to .classpath
...
Now that the /system/media/mca code is cleaned up, add it back to
.classpath along with Camera and Gallery2, which could not be be
accessed in eclipse previously without build errors.
Change-Id: I6ff01f6fa61d33a3e5c8a9f11a564f167d81dc38
Bug-Id: 5584451
2012-02-08 10:30:00 -08:00
Raphael Moll
26871ff125
am fd7545f5: Merge "Win SDK: add ext4_utils to project whitelist."
...
* commit 'fd7545f53b403a3dc4418eef3e9f4699fb5d46cd':
Win SDK: add ext4_utils to project whitelist.
2012-02-06 15:43:48 -08:00
Raphael Moll
fd7545f53b
Merge "Win SDK: add ext4_utils to project whitelist."
2012-02-06 15:42:10 -08:00
Jesse Hall
1a2538e2e5
am 25f63089: am 80866951: am bc96fa33: am 0e981c83: EmuGL: Fix heap corruption
...
* commit '25f63089124e20fedc434724cf8fae9eaf2d2c19':
2012-02-06 14:41:28 -08:00
Jesse Hall
15c77094dc
am 66258220: am 165c21e8: am 1276f7ba: am 0e981c83: EmuGL: Fix heap corruption
...
* commit '66258220b0c86e72002c5be15708f2cc83dbd39c':
EmuGL: Fix heap corruption
2012-02-06 14:41:27 -08:00
Jesse Hall
25f6308912
am 80866951: am bc96fa33: am 0e981c83: EmuGL: Fix heap corruption
...
* commit '808669519a89340946b0d52451adf97242d48689':
2012-02-06 14:39:24 -08:00
Jesse Hall
66258220b0
am 165c21e8: am 1276f7ba: am 0e981c83: EmuGL: Fix heap corruption
...
* commit '165c21e84cf87c6d5ccf085546d6313ea1533c6f':
EmuGL: Fix heap corruption
2012-02-06 14:39:22 -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
Tor Norbye
222a5346e0
am 80437f41: Merge "Update default project icons, and add an xhdpi version"
...
* commit '80437f41e53cd90d1ea1ba17158f4c3064c2fbc7':
Update default project icons, and add an xhdpi version
2012-02-06 12:51:41 -08:00
Tor Norbye
80437f41e5
Merge "Update default project icons, and add an xhdpi version"
2012-02-06 12:48:20 -08:00
Raphael Moll
0a94feb3fe
Win SDK: add ext4_utils to project whitelist.
...
Change-Id: I00ce4e081d05608711f6e5e06dc5448309d76e94
2012-02-06 11:13:41 -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
0073874672
am 80df85f0: am f97ce5b3: am b8504b0a: am 47365074: Merge "Adding Android Developers Google+ redirect" into ics-mr1
...
* commit '80df85f0c10b5e61b88b599e2840a7084d84d10c':
2012-02-03 15:09:38 -08:00
Trevor Johns
c1095b9172
am 3c0c2cba: am 39107cac: am 7b8f2c59: am 47365074: Merge "Adding Android Developers Google+ redirect" into ics-mr1
...
* commit '3c0c2cba1c88fe214d7dcf04163f048b2f0b4d26':
Adding Android Developers Google+ redirect
2012-02-03 15:09:37 -08:00
Trevor Johns
a13140a0f3
am 18865c54: am c5b0ae26: am 87f81a89: am 7a94a9dc: Merge "Adding manual redirect support to developer.android.com." into ics-mr1
...
* commit '18865c540145c6f1e27ffd26aeb384317be2eca9':
2012-02-03 15:09:36 -08:00
Trevor Johns
39b27788f7
am a40ba9aa: am b0d9d375: am 23195b75: am 7a94a9dc: Merge "Adding manual redirect support to developer.android.com." into ics-mr1
...
* commit 'a40ba9aaa76f3c1e8194603a85578d4d90d8b0e3':
Adding manual redirect support to developer.android.com.
2012-02-03 15:09:35 -08:00
Trevor Johns
80df85f0c1
am f97ce5b3: am b8504b0a: am 47365074: Merge "Adding Android Developers Google+ redirect" into ics-mr1
...
* commit 'f97ce5b3cb44f47abde6ab8b6c651c0abb2aa5f1':
2012-02-03 15:06:53 -08:00
Trevor Johns
3c0c2cba1c
am 39107cac: am 7b8f2c59: am 47365074: Merge "Adding Android Developers Google+ redirect" into ics-mr1
...
* commit '39107cac7bf24aa9e206e66d5eaccef7f9267cc5':
Adding Android Developers Google+ redirect
2012-02-03 15:06:52 -08:00
Trevor Johns
18865c5401
am c5b0ae26: am 87f81a89: am 7a94a9dc: Merge "Adding manual redirect support to developer.android.com." into ics-mr1
...
* commit 'c5b0ae26c9f5353658ff2d6d5143127e6bf50947':
2012-02-03 15:06:51 -08:00
Trevor Johns
a40ba9aaa7
am b0d9d375: am 23195b75: am 7a94a9dc: Merge "Adding manual redirect support to developer.android.com." into ics-mr1
...
* commit 'b0d9d37520899b8eb305b55dde83f1a85d79bc6b':
Adding manual redirect support to developer.android.com.
2012-02-03 15:06:50 -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
6497473fc5
am 3782f330: am a6ebde03: am eea4e8e8: am df458cb8: Fix api version file with proper data enum.
...
* commit '3782f330aafd27e8fa8443a537b384d0813c99e5':
2012-02-01 14:02:18 -08:00
Xavier Ducrohet
3782f330aa
am a6ebde03: am eea4e8e8: am df458cb8: Fix api version file with proper data enum.
...
* commit 'a6ebde03230e919083f3a0792d236304c9e92784':
2012-02-01 13:59:21 -08:00
