tree 55f17f6ae957a7752cefef6a67b77d66c1bdf473
parent 79a8c2e9def3c41ac6bb1dd13c2d6ac179b3ac2e
parent 181857a19dcaf3b05f02afd0c0233b7e73bc2a01
author Jean-Baptiste Queru <jbq@google.com> 1277913512 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1277913512 -0700

Merge "Change branch name to gingerbread, to match reality - DO NOT MERGE" into gingerbread