merge from gingerbread
authorJean-Baptiste Queru <jbq@google.com>
Thu, 9 Dec 2010 17:11:23 +0000 (09:11 -0800)
committerJean-Baptiste Queru <jbq@google.com>
Thu, 9 Dec 2010 17:11:23 +0000 (09:11 -0800)
commit5ad8a55c2a74f855fd4530e98147059206b7b2b0
tree7e148e3ff8ac25ed3ae8f048c54df9c99e2f5387
parentb2fb2046e3dcf21c8b64e2b20195259ce369c0ea
parent9a69f10556fcd7e600f862992e1e16d69b34cb48
merge from gingerbread

Change-Id: I38873b898f431d1815ead588807a00068a7e802c