Merge branch 'gingerbread-release' into saved-gingerbread-release
authorandroid-merger <android-merger@google.com>
Thu, 20 Jan 2011 07:53:57 +0000 (23:53 -0800)
committerandroid-merger <android-merger@google.com>
Thu, 20 Jan 2011 07:53:57 +0000 (23:53 -0800)
commit6dfb6c7b0fff0c6fda35eb1180213fc5c76cc3c8
tree7e939e7a2d9fd8f3b9a0771e817931b2ef40fecb
parent54bf801f93f02fa09e3dbfb082da061a7953eb3d
parent81056a1c2bf8d42a9ca70eee90bb04e268dcddb1
Merge branch 'gingerbread-release' into saved-gingerbread-release