OSDN Git Service

am 60d9b33f: (-s ours) am e3b0bda2: do not merge
authorRoy West <rwest@google.com>
Sun, 10 Oct 2010 18:03:45 +0000 (11:03 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sun, 10 Oct 2010 18:03:45 +0000 (11:03 -0700)
commit0cd297b3fb529cdcb35a452205b916880e0ede88
tree927c944a1d260cb0d87c3ba5318166a35c23ae9c
parentb6571974c75bedb4e7760691880a69d633740c65
parent60d9b33fcf3bfee7d3d3a85625376fb74d0c593c
am 60d9b33f: (-s ours) am e3b0bda2: do not merge

Merge commit '60d9b33fcf3bfee7d3d3a85625376fb74d0c593c'

* commit '60d9b33fcf3bfee7d3d3a85625376fb74d0c593c':
  do not merge