OSDN Git Service

am 1fc015f0: (-s ours) am 4741f411: Do not merge.
authorRob Tsuk <robtsuk@google.com>
Wed, 1 Dec 2010 22:02:29 +0000 (14:02 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 1 Dec 2010 22:02:29 +0000 (14:02 -0800)
commit0dea64c9575802352241ad43b78e20198a6e137c
treec729707e5ba5ed11e581bc49c79e533ad6e96050
parentb84030fc8163cde1f8f055973ef63d3e1670bf52
parent1fc015f0ce86a2bed612d2eec53b01cac6b8a793
am 1fc015f0: (-s ours) am 4741f411: Do not merge.

* commit '1fc015f0ce86a2bed612d2eec53b01cac6b8a793':
  Do not merge.