OSDN Git Service

am 1358b6a4: Tweak to make merges easier
authorJean-Baptiste Queru <jbq@google.com>
Sat, 29 Jan 2011 22:43:33 +0000 (14:43 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 29 Jan 2011 22:43:33 +0000 (14:43 -0800)
commit3100207be5cb0ef93a5271f24b6f03a2e75291ad
treeb9785201b81473816814f0968720276f42e8c560
parent34ebb5bfec0794d5852b47edaa8b9d4cea22e515
parent1358b6a4fb68e81058aa938e46b125350bdf0fff
am 1358b6a4: Tweak to make merges easier

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