tree 6d110757b7315e9f804d075fffb5cb5dde8a6a6a
parent ee4c17eec30b270f9a91cc92b40fc56435a59027
parent 4ddd99090e37edd3e6b7c57ddd065fa4e7007bf2
author Jean-Baptiste Queru <jbq@google.com> 1296770714 -0800
committer Jean-Baptiste Queru <jbq@google.com> 1296770723 -0800

Merge from open-source gingerbread

Change-Id: I19c4ba36cf4f2ef518b55768360b0bff1a92a5ab