tree bdce8b555bc04e61b7fe28987fe8db44786797e0
parent 981a5f01a01e57455eac739e8b3e90541fad7871
parent 0f5fe63019393f9ab14f8d1e82edbf6a2727f804
author Jean-Baptiste Queru <jbq@google.com> 1287187377 -0700
committer Jean-Baptiste Queru <jbq@google.com> 1287187377 -0700

Merge a851d8d0 from gingerbread

Change-Id: Iea0e3fa1662d6326ab337821fe52a65a9dfd989a