tree eff08b9aa914a18248dbc6729402483e97e21078
parent 0c3d5d9541fd254963355af83e47ad0696115adb
parent 1840de544bf82ddfb1b6a23cb828fd52b0880f6c
author Jean-Baptiste Queru <jbq@google.com> 1291995976 -0800
committer Jean-Baptiste Queru <jbq@google.com> 1291995976 -0800

reconcile with open-source gingerbread

Change-Id: I817f61141bf2c5189b13965ea9f3ead8f19d61cb