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)
* commit 'dff2d8422cee19d35d7eac467ac0fc2315c1c899':
  Fix bad rebase.


Trivial merge