tree 0cc71896ea3c19cae332ef4649c9755bb4b9e5ca
parent eb17d6f51a9776f02be84859b8980a6317abd27c
parent 049b172b48663266f8aed02595fcb92e20d192c2
author Jean-Baptiste Queru <jbq@google.com> 1296668856 -0800
committer Jean-Baptiste Queru <jbq@google.com> 1296668863 -0800

Merge from gingerbread

Change-Id: Ifb3d42aa0f3772ca545f739df347eeb0ca7f58dd