Commit Graph

8779 Commits

Author SHA1 Message Date
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
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
f56c503459 am dadcdf59: am 8a01c6a2: am c90d4c8a: am df458cb8: Fix api version file with proper data enum.
* commit 'dadcdf59ce530dc1b39d6191c158ab3598a1de76':
  Fix api version file with proper data enum.
2012-02-01 13:53:21 -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
dadcdf59ce am 8a01c6a2: am c90d4c8a: am df458cb8: Fix api version file with proper data enum.
* commit '8a01c6a2675d2c5364935be64a8cf78d8bfb6487':
  Fix api version file with proper data enum.
2012-02-01 13:51:45 -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
Svetoslav Ganov
c8cd798a74 am 6848f335: Merge "Updating the monkey to use a dedicated UI test bridge."
* commit '6848f33575fdf51ad0a4a0d4e866c71f93ed8d61':
  Updating the monkey to use a dedicated UI test bridge.
2012-02-01 13:48:33 -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
Svetoslav Ganov
6848f33575 Merge "Updating the monkey to use a dedicated UI test bridge." 2012-02-01 13:45:42 -08:00
The Android Open Source Project
410586a45c am 8dba1079: am 054a457c: am dff907ec: Reconcile with ics-mr1-release
* commit '8dba10791e8292604505fd4156bd2ca4a55df23f':
2012-02-01 10:05:21 -08:00
The Android Open Source Project
8dba10791e am 054a457c: am dff907ec: Reconcile with ics-mr1-release
* commit '054a457c105dfc7d2c9e0af5576f7e480c7c83e0':
2012-02-01 10:03:14 -08:00
The Android Open Source Project
054a457c10 am dff907ec: Reconcile with ics-mr1-release
* commit 'dff907ecf5225402f3c2e3930ae8cbb292b22858':
2012-02-01 10:00:25 -08:00
The Android Open Source Project
226c205952 am 02a3315f: am 9114b85e: Reconcile with ics-mr1-release
* commit '02a3315f9e357d40b6af51b0401f6773e032a2ca':
2012-02-01 09:11:19 -08:00
The Android Open Source Project
02a3315f9e am 9114b85e: Reconcile with ics-mr1-release
* commit '9114b85e63f464cfe5dda62bb430e1200dcbe73e':
2012-02-01 09:09:12 -08:00
The Android Open Source Project
dff907ecf5 Reconcile with ics-mr1-release
Change-Id: I74de9b8f1c59bb309cecda20c9181c69958c296c
2012-02-01 08:49:29 -08:00
The Android Open Source Project
9114b85e63 Reconcile with ics-mr1-release
Change-Id: I9edbfba9b4c69b550b60723b903bae30580a149b
2012-02-01 08:42:39 -08:00