tree 7111485236552775712f36a80e6762fcc6f4c644
parent f03f6201c0da623d35e966f56bbf45f5d1c671b8
parent 9381f5c96fe3d4e4918a66ea418215c01919f4eb
author Jean-Baptiste Queru <jbq@google.com> 1317250066 -0700
committer Jean-Baptiste Queru <jbq@google.com> 1317250066 -0700

Merge from gingerbread

Change-Id: I2eb7136a1bf5aa57b1a2c28de71aa4dd7fce178d