Commit graph

2787 commits

Author SHA1 Message Date
Ying Wang
2eed660c66 am ffff0028: Pass pagesize to makebootimage.
Merge commit 'ffff0028ae9a83893f71efa370d283e2247bcdd4' into gingerbread-plus-aosp

* commit 'ffff0028ae9a83893f71efa370d283e2247bcdd4':
  Pass pagesize to makebootimage.
2010-08-23 13:52:18 -07:00
Ying Wang
ffff0028ae Pass pagesize to makebootimage.
Change-Id: I719d765245469921de105430fdd92d478ea48e82
2010-08-23 12:56:25 -07:00
Ying Wang
d3b973d897 am 065521be: Backport ext4 support from master [DO NOT MERGE]
Merge commit '065521be4fd6965058fbd599bb43fe13101fee7c' into gingerbread-plus-aosp

* commit '065521be4fd6965058fbd599bb43fe13101fee7c':
  Backport ext4 support from master [DO NOT MERGE]
2010-08-23 11:49:10 -07:00
Ying Wang
065521be4f Backport ext4 support from master [DO NOT MERGE]
ext4 support is needed by crespo.

Change-Id: I604cb9ada526ce8ba6b3648171ac1d614a5519a9
2010-08-23 11:34:40 -07:00
Ying Wang
d4ee2de1c3 am ad3cf5f8: Restore OTA for crespo. [DO NOT MERGE]
Merge commit 'ad3cf5f868fc36de0a4fa501f074d35a94496b27' into gingerbread-plus-aosp

* commit 'ad3cf5f868fc36de0a4fa501f074d35a94496b27':
  Restore OTA for crespo. [DO NOT MERGE]
2010-08-21 17:00:59 -07:00
Ying Wang
ad3cf5f868 Restore OTA for crespo. [DO NOT MERGE]
Change-Id: I2472942741bdb2e4fa5037883f6acbe6c4ca36c3
2010-08-21 16:58:06 -07:00
Jean-Baptiste Queru
ed91928a6c am 60d1ee3e: Better way to disable OTAs for crespo - DO NOT MERGE
Merge commit '60d1ee3e539e02ba701b9ff647fd23aca18f890d' into gingerbread-plus-aosp

* commit '60d1ee3e539e02ba701b9ff647fd23aca18f890d':
  Better way to disable OTAs for crespo - DO NOT MERGE
2010-08-20 19:22:51 -07:00
Jean-Baptiste Queru
60d1ee3e53 Better way to disable OTAs for crespo - DO NOT MERGE
OTAs need to be disabled for all products using crespo
hardware, not just a single one.

Change-Id: I961462e5e87bec8c59dafa13dbf0fdc96bab29ab
2010-08-20 19:19:55 -07:00
Ying Wang
13a019fe32 am 7daa9132: Disable OTA for crespo [DO NOT MERGE]
Merge commit '7daa91323139fa7c0435a07b0e3fad6056d0954b' into gingerbread-plus-aosp

* commit '7daa91323139fa7c0435a07b0e3fad6056d0954b':
  Disable OTA for crespo [DO NOT MERGE]
2010-08-20 17:13:56 -07:00
Ying Wang
7daa913231 Disable OTA for crespo [DO NOT MERGE]
Change-Id: I22c29226bb783fed34766e91d43edcf6e61a837f
2010-08-20 16:45:19 -07:00
android-build SharedAccount
ba509c8db0 am c434bbbb: am 817a8ac9: (-s ours) bump version from 2.2 to 2.2.1 for next froyo release
Merge commit 'c434bbbb2c8453f581e0b993ecf23949ca7c5f9b' into gingerbread-plus-aosp

* commit 'c434bbbb2c8453f581e0b993ecf23949ca7c5f9b':
  bump version from 2.2 to 2.2.1 for next froyo release
2010-08-18 13:38:19 -07:00
android-build SharedAccount
c434bbbb2c am 817a8ac9: (-s ours) bump version from 2.2 to 2.2.1 for next froyo release
Merge commit '817a8ac99392228f894d18ea40b0fb4c1b6ca8fe' into gingerbread

* commit '817a8ac99392228f894d18ea40b0fb4c1b6ca8fe':
  bump version from 2.2 to 2.2.1 for next froyo release
2010-08-18 08:45:04 -07:00
android-build SharedAccount
817a8ac993 bump version from 2.2 to 2.2.1 for next froyo release
Change-Id: Ic636f111d4a7a69954539bbd480b7119bf0d730f
2010-08-17 22:44:17 -07:00
Raphael Moll
ddf08caafa am ddeb150d: Add easymock for list of Windows SDK targets.
Merge commit 'ddeb150d8d300806de576430444bf1a84ff35e96' into gingerbread-plus-aosp

* commit 'ddeb150d8d300806de576430444bf1a84ff35e96':
  Add easymock for list of Windows SDK targets.
2010-08-17 07:48:46 -07:00
Raphael Moll
ddeb150d8d Add easymock for list of Windows SDK targets.
Also correctly sorted the windows sdk target list.

Change-Id: I4742a0b98ece8e0693a6f346a1f09595253d65c1
2010-08-16 11:17:21 -07:00
Jean-Baptiste Queru
4a6e7d7c49 am 43d406e5: Merge "add drm/ directory to include it as part of frameworks"
Merge commit '43d406e5c633af505de0e05e44fda9cfe781c184' into gingerbread-plus-aosp

* commit '43d406e5c633af505de0e05e44fda9cfe781c184':
  add drm/ directory to include it as part of frameworks
2010-08-16 08:15:24 -07:00
Jean-Baptiste Queru
43d406e5c6 Merge "add drm/ directory to include it as part of frameworks" 2010-08-16 08:08:48 -07:00
Hung-ying Tyan
d81e9f88f4 am ddefdef5: Make ProGuard keep necessary members for serializable classes
Merge commit 'ddefdef5bc560d95f799993759c22ddc02e61b49' into gingerbread-plus-aosp

* commit 'ddefdef5bc560d95f799993759c22ddc02e61b49':
  Make ProGuard keep necessary members for serializable classes
2010-08-10 17:50:28 -07:00
Hung-ying Tyan
ddefdef5bc Make ProGuard keep necessary members for serializable classes
Change-Id: I845eb8280d0cab7e426b17c94d74bc409e66c193
2010-08-11 08:24:46 +08:00
Chung-yih Wang
9b7ebf5dbd am 1a2649f0: Merge "Add voip(SIP related codes) into framework." into gingerbread
Merge commit '1a2649f0da35218748db5aa02c9969246a714b8f' into gingerbread-plus-aosp

* commit '1a2649f0da35218748db5aa02c9969246a714b8f':
  Add voip(SIP related codes) into framework.
2010-08-05 19:37:54 -07:00
Chung-yih Wang
1a2649f0da Merge "Add voip(SIP related codes) into framework." into gingerbread 2010-08-05 19:35:35 -07:00
Scott Main
240782f2bd am 6eea9363: am 4f2436dc: update carousel icon for nexus one dev phone
Merge commit '6eea9363f4aeaa861f2e021ea3c9494cb49a83b6' into gingerbread-plus-aosp

* commit '6eea9363f4aeaa861f2e021ea3c9494cb49a83b6':
  update carousel icon for nexus one dev phone
2010-08-05 15:18:06 -07:00
Scott Main
b7256fd685 am be4696e0: am 7589398c: Merge "Doc change: Add nexus one to dev phones image." into froyo
Merge commit 'be4696e073b93e0e65f767e77166a08efd67c6cb' into gingerbread-plus-aosp

* commit 'be4696e073b93e0e65f767e77166a08efd67c6cb':
  Doc change: Add nexus one to dev phones image.
2010-08-05 15:18:03 -07:00
Scott Main
6eea9363f4 am 4f2436dc: update carousel icon for nexus one dev phone
Merge commit '4f2436dc3513f671935811bfa0c7e6c2c15505be' into gingerbread

* commit '4f2436dc3513f671935811bfa0c7e6c2c15505be':
  update carousel icon for nexus one dev phone
2010-08-05 15:10:05 -07:00
Scott Main
be4696e073 am 7589398c: Merge "Doc change: Add nexus one to dev phones image." into froyo
Merge commit '7589398cf9127987a768ccfb3dbb9cde54d00f02' into gingerbread

* commit '7589398cf9127987a768ccfb3dbb9cde54d00f02':
  Doc change: Add nexus one to dev phones image.
2010-08-05 15:10:03 -07:00
Brian Carlstrom
f9be43305a am 7dc35a3b: Tracking merge of dalvik-dev to gingerbread
Merge commit '7dc35a3b9c7fe7e6aaacc8e11dca9ca94f4b4ff0' into gingerbread-plus-aosp

* commit '7dc35a3b9c7fe7e6aaacc8e11dca9ca94f4b4ff0':
  Tracking merge of dalvik-dev to gingerbread
2010-08-05 10:40:23 -07:00
Scott Main
4f2436dc35 update carousel icon for nexus one dev phone
Change-Id: I7f92063a7dc6b49dd6bb044b79931dbc9268ebd6
2010-08-05 09:44:47 -07:00
Scott Main
7589398cf9 Merge "Doc change: Add nexus one to dev phones image." into froyo 2010-08-05 08:05:37 -07:00
Brian Carlstrom
7dc35a3b9c Tracking merge of dalvik-dev to gingerbread
git cherry-pick --no-commit f2f3e4b2
git cherry-pick --no-commit b6a08f0cd3
git cherry-pick --no-commit d05d74b2d6
git cherry-pick --no-commit 5479d77e32

Change-Id: I6f339aa73823e053146719b3af7af91d5375df1c
2010-08-04 23:17:47 -07:00
Chung-yih Wang
ab8ed58c63 Add voip(SIP related codes) into framework.
Change-Id: I12bbeb3dacd51b0234872529479e61bdd8536629
2010-08-05 11:31:07 +08:00
Ying Wang
33c11ac3f1 am e1f37ba0: am 55edb20e: Merge "Dist apkcerts.txt for unbundled builds" into froyo
Merge commit 'e1f37ba0cfb0bcd8c463d0d85ccbbbbec4cc5bc4' into gingerbread-plus-aosp

* commit 'e1f37ba0cfb0bcd8c463d0d85ccbbbbec4cc5bc4':
  Dist apkcerts.txt for unbundled builds
2010-07-29 10:30:13 -07:00
Ying Wang
e1f37ba0cf am 55edb20e: Merge "Dist apkcerts.txt for unbundled builds" into froyo
Merge commit '55edb20e246e88afd841f63725c647132d9aca17' into gingerbread

* commit '55edb20e246e88afd841f63725c647132d9aca17':
  Dist apkcerts.txt for unbundled builds
2010-07-29 10:27:45 -07:00
Ying Wang
55edb20e24 Merge "Dist apkcerts.txt for unbundled builds" into froyo 2010-07-29 10:21:15 -07:00
Xavier Ducrohet
4527075964 am e743c53b: Package ddmlib-prebuilt with CTS.
Merge commit 'e743c53b88faf35be47667b0252c881c7b32f856' into gingerbread-plus-aosp

* commit 'e743c53b88faf35be47667b0252c881c7b32f856':
  Package ddmlib-prebuilt with CTS.
2010-07-28 15:14:51 -07:00
The Android Open Source Project
636e6dec48 am 609fef71: am 3a0576a4: merge from open-source froyo
Merge commit '609fef7173a1278cb79d7aefdd22a22547648cab' into gingerbread-plus-aosp

* commit '609fef7173a1278cb79d7aefdd22a22547648cab':
2010-07-28 11:47:24 -07:00
The Android Open Source Project
609fef7173 am 3a0576a4: merge from open-source froyo
Merge commit '3a0576a41881ceb11c3b11642666abc2f3d5a271' into gingerbread

* commit '3a0576a41881ceb11c3b11642666abc2f3d5a271':
2010-07-28 11:35:24 -07:00
The Android Open Source Project
3a0576a418 merge from open-source froyo
Change-Id: I947332f4e978326309fe14d01875ebfe94405c9f
2010-07-28 11:24:38 -07:00
Xavier Ducrohet
e743c53b88 Package ddmlib-prebuilt with CTS.
This ensures that CTS is using a compatible ddmlib.

Change-Id: Iff6d2bfec873949dfd07ccf758bf257350f11298
2010-07-28 11:07:31 -07:00
The Android Open Source Project
dbaff11c84 reconcile forked froyos
Change-Id: Ie0ab94638cc4489d9644e17d26f0603578a011e7
2010-07-28 10:41:54 -07:00
aimitakeshi
2bdf2653dc add drm/ directory to include it as part of frameworks
Change-Id: I62a6ab77587d88ea960f9ece17dcb75726e7e5a9
2010-07-27 08:34:47 +09:00
The Android Open Source Project
4e8e998ecc am 989fade3: am af44485f: merge from open-source froyo
Merge commit '989fade304ef5253b5b401f347e26f768d75f35f' into gingerbread-plus-aosp

* commit '989fade304ef5253b5b401f347e26f768d75f35f':
  Include Test Case List from CTS Project
2010-07-26 12:25:52 -07:00
The Android Open Source Project
989fade304 am af44485f: merge from open-source froyo
Merge commit 'af44485fe83bb36a9d55fb54a8f5362854dd7b10' into gingerbread

* commit 'af44485fe83bb36a9d55fb54a8f5362854dd7b10':
  Include Test Case List from CTS Project
2010-07-26 12:06:35 -07:00
The Android Open Source Project
af44485fe8 merge from open-source froyo
Change-Id: I6bac03b1f646ea171ee20f0e90d37f337d7987fa
2010-07-26 12:02:01 -07:00
Evan Charlton
606540b739 resolved conflicts for merge of f2bfa76c to gingerbread-plus-aosp
Change-Id: I67b9af3ef344cfa7502f780d82c1a3d8a1a33f6d
2010-07-26 08:53:19 -07:00
Ying Wang
efb2168266 Dist apkcerts.txt for unbundled builds
Change-Id: Ic381d846f020dc43f48f43581c0db5721f2e36f7
2010-07-23 16:42:13 -07:00
Dirk Dougherty
35e642f768 Doc change: Add nexus one to dev phones image.
Change-Id: I39541b208ed4a2f7b7f48c42f37f3ccdfc05de02
2010-07-23 14:39:41 -07:00
Evan Charlton
f2bfa76cf8 resolved conflicts for merge of 121a7873 to gingerbread
Change-Id: I7b5cecd4236f263c31d4af73d929ff6b5729089e
2010-07-23 12:21:48 -07:00
Jean-Baptiste Queru
44d628540c am 8339ba91: Merge "Replaced AlarmClock with DeskClock"
Merge commit '8339ba912d2932a1caad24a3977ddeca0c549c48' into gingerbread-plus-aosp

* commit '8339ba912d2932a1caad24a3977ddeca0c549c48':
  Replaced AlarmClock with DeskClock
2010-07-23 11:36:58 -07:00
Jean-Baptiste Queru
8339ba912d Merge "Replaced AlarmClock with DeskClock" 2010-07-23 11:25:51 -07:00
Christian Mehlmauer
5022d63cd2 Replaced AlarmClock with DeskClock
Change-Id: I1a9b9ce79b5b16709fe2d89638285633801b6d24
2010-07-23 20:09:54 +02:00