Merge branch 'gingerbread-release' into saved-gingerbread-release
authorandroid-merger <android-merger@google.com>
Wed, 19 Jan 2011 22:12:16 +0000 (14:12 -0800)
committerandroid-merger <android-merger@google.com>
Wed, 19 Jan 2011 22:12:16 +0000 (14:12 -0800)
commit54bf801f93f02fa09e3dbfb082da061a7953eb3d
tree7e939e7a2d9fd8f3b9a0771e817931b2ef40fecb
parent7b8d8e536f83e62268257d2f31a2e6b9caf89285
parentc92fe6d6c2d55a85040edf1d21810d64d882ca16
Merge branch 'gingerbread-release' into saved-gingerbread-release