OSDN Git Service

am 1358b6a4: Tweak to make merges easier
authorJean-Baptiste Queru <jbq@google.com>
Sat, 29 Jan 2011 22:32:04 +0000 (14:32 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 29 Jan 2011 22:32:04 +0000 (14:32 -0800)
commit8f4a04f04cd3696f6a5255a54464779dda94d5ba
tree0cbb8322b581f3089507005486f2ab5eba0dea6b
parent7ea919c44b05daf99c045d09eb3edafb96019da7
parent1358b6a4fb68e81058aa938e46b125350bdf0fff
am 1358b6a4: Tweak to make merges easier

* commit '1358b6a4fb68e81058aa938e46b125350bdf0fff':
  Tweak to make merges easier