tree 60969926e0f1cb7d05090956002d88254e7139dd
parent 9a0255c3c477e4414575b5ffbac63f59b85dee64
parent 81f81875bcd8da89d73e64e284f70c3e804faf0b
author Jean-Baptiste Queru <jbq@google.com> 1296771927 -0800
committer Jean-Baptiste Queru <jbq@google.com> 1296771938 -0800

Merge from gingerbread

Change-Id: I6b895012db6b96666dc3257b1f2e430925981188