Merge from honeycomb
authorJean-Baptiste Queru <jbq@google.com>
Sat, 29 Jan 2011 22:32:34 +0000 (14:32 -0800)
committerJean-Baptiste Queru <jbq@google.com>
Sat, 29 Jan 2011 22:39:14 +0000 (14:39 -0800)
commit34d7b449b856927d902e6df2e09c2dd8103c45a6
treeaa73cb4c2fc98821a6ee912b1fc830c6fb0ee84f
parentbf3ada51b8494a931c2ba1dd6b437040cf97882d
parent25ffbb26da612071e4dc4a3950b0c8abb2642c08
Merge from honeycomb

Change-Id: I2778dfd3a4cf20255e07483dcc3676b2fca022b9