OSDN Git Service

am 6d104f11: (-s ours) am 6901f963: am 93552de8: Merge "stubs"
authorJean-Baptiste Queru <jbq@google.com>
Fri, 11 Feb 2011 18:16:45 +0000 (10:16 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 11 Feb 2011 18:16:45 +0000 (10:16 -0800)
commit0ba97e3ff830e3f6045650e0a4bd0d08dad50fcc
tree284ec1c97e2c3895106d543aba7dcda223aa30f7
parente8d074d763f1c9551c41654589597e45476d27e0
parent6d104f118a59e276eb577ae322f29c2ff8a5015a
am 6d104f11: (-s ours) am 6901f963: am 93552de8: Merge "stubs"

* commit '6d104f118a59e276eb577ae322f29c2ff8a5015a':
  stubs