tree 39ea7f414d1c195aca8fde0de7f49970718e8e0e
parent 3ef1d674806734c2e237a54815ea5c077ce8c344
parent 1840de544bf82ddfb1b6a23cb828fd52b0880f6c
author Jean-Baptiste Queru <jbq@google.com> 1291996867 -0800
committer Jean-Baptiste Queru <jbq@google.com> 1291996867 -0800

Merge from gingerbread

Change-Id: Icfc2bb041b1360a8a0258d7de5547fded86bf7ec