OSDN Git Service

Merge "Fix bad rebase."
authorNicolas Geoffray <ngeoffray@google.com>
Thu, 29 Jan 2015 11:40:22 +0000 (11:40 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Thu, 29 Jan 2015 11:40:23 +0000 (11:40 +0000)
commitdff2d8422cee19d35d7eac467ac0fc2315c1c899
tree3e31c006b7906447a3e5576f9d15b588b4c5a97d
parentc9ff6b112d25657128f9a7251e253b1382b0f1b9
parent0a299b9305d42074a47a7922aff855c840a76cfd
Merge "Fix bad rebase."