tree 4237b201aa0d2be4ee01a440f01448e5c23e7816
parent 4feebc2c7d2cdc84b820b20d0a7bf8d47eb048d0
parent ba3dd32357b47ab0b55a1976bbafc225df78a59d
author Jean-Baptiste Queru <jbq@google.com> 1296324602 -0800
committer Jean-Baptiste Queru <jbq@google.com> 1296324666 -0800

Merge ba3dd323 from gingerbread

Change-Id: I615bf5177abbc680292e0116491da58835c7396f