OSDN Git Service

am dff2d842: Merge "Fix bad rebase."
authorNicolas Geoffray <ngeoffray@google.com>
Thu, 29 Jan 2015 11:45:32 +0000 (11:45 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 29 Jan 2015 11:45:32 +0000 (11:45 +0000)
commit06b8c2ff33e17fe384ef7d1c9706034d91cafc9d
tree3e31c006b7906447a3e5576f9d15b588b4c5a97d
parentdc70a465e42c2408a131c6fa496267f20bdf654b
parentdff2d8422cee19d35d7eac467ac0fc2315c1c899
am dff2d842: Merge "Fix bad rebase."

* commit 'dff2d8422cee19d35d7eac467ac0fc2315c1c899':
  Fix bad rebase.