Merge commit 'ba509c8db0b00fdc9143459b0d9fefb2c25a5861'
* commit 'ba509c8db0b00fdc9143459b0d9fefb2c25a5861':
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
Merge commit '817a8ac99392228f894d18ea40b0fb4c1b6ca8fe' into gingerbread
* commit '817a8ac99392228f894d18ea40b0fb4c1b6ca8fe':
bump version from 2.2 to 2.2.1 for next froyo release
Merge commit 'ddf08caafa9644a502c0804450b9b6572010eb0d'
* commit 'ddf08caafa9644a502c0804450b9b6572010eb0d':
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.
Merge commit '4a6e7d7c49fa91a3c26b091d2ac653f4feeb003f'
* commit '4a6e7d7c49fa91a3c26b091d2ac653f4feeb003f':
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
Merge commit 'd81e9f88f4576dd8b18143f0a0d5f50c3758202b'
* commit 'd81e9f88f4576dd8b18143f0a0d5f50c3758202b':
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
Merge commit '1a2649f0da35218748db5aa02c9969246a714b8f' into gingerbread-plus-aosp
* commit '1a2649f0da35218748db5aa02c9969246a714b8f':
Add voip(SIP related codes) into framework.
Merge commit '240782f2bdc804fb5635a4bb7fbcfb104d48ddb3'
* commit '240782f2bdc804fb5635a4bb7fbcfb104d48ddb3':
update carousel icon for nexus one dev phone
Merge commit 'b7256fd6851d90c088b8cc1603fa62faa95714de'
* commit 'b7256fd6851d90c088b8cc1603fa62faa95714de':
Doc change: Add nexus one to dev phones image.
Merge commit '6eea9363f4aeaa861f2e021ea3c9494cb49a83b6' into gingerbread-plus-aosp
* commit '6eea9363f4aeaa861f2e021ea3c9494cb49a83b6':
update carousel icon for nexus one dev phone
Merge commit 'be4696e073b93e0e65f767e77166a08efd67c6cb' into gingerbread-plus-aosp
* commit 'be4696e073b93e0e65f767e77166a08efd67c6cb':
Doc change: Add nexus one to dev phones image.
Merge commit '4f2436dc3513f671935811bfa0c7e6c2c15505be' into gingerbread
* commit '4f2436dc3513f671935811bfa0c7e6c2c15505be':
update carousel icon for nexus one dev phone
Merge commit '7589398cf9127987a768ccfb3dbb9cde54d00f02' into gingerbread
* commit '7589398cf9127987a768ccfb3dbb9cde54d00f02':
Doc change: Add nexus one to dev phones image.