tree 84554794e3e22cf32d7b5d78e3e740ebe2c9af31
parent cc2915c0b1608933819aa284788dbdb184fe9823
parent f126ad3b6484ef62eed202f1f49cc4557c0a3848
author Jean-Baptiste Queru <jbq@google.com> 1296322664 -0800
committer Jean-Baptiste Queru <jbq@google.com> 1296322664 -0800

Merge f126ad3b from gingerbread

Change-Id: I13a79033239d306fcf9291ca7fad7445f2cd1f47