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)
* commit '6d104f118a59e276eb577ae322f29c2ff8a5015a':
  stubs


Trivial merge