OSDN Git Service

am 63bd55c7: am cdfe8999: Fix for multiple merge problem.
authorGilles Debunne <debunne@google.com>
Wed, 9 Feb 2011 20:19:46 +0000 (12:19 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 9 Feb 2011 20:19:46 +0000 (12:19 -0800)
commit78fd484d9bf06aa4e7acdc8e4c02cf442554ebef
treeea8394774dd2af9d10699c0198d5639d47f212a6
parentb14ac99db73cabd31f149c8a487115cdafd21290
parent2f630a5533cc991a33024e256714c323bcb37298
am 63bd55c7: am cdfe8999: Fix for multiple merge problem.

* commit '63bd55c7bf6f5d9384ad25637a4f4a7d2ef8d441':
  Fix for multiple merge problem.