OSDN Git Service

Merge "stubs"
authorJean-Baptiste Queru <jbq@google.com>
Mon, 31 Jan 2011 19:32:33 +0000 (11:32 -0800)
committerAndroid Code Review <code-review@android.com>
Mon, 31 Jan 2011 19:32:33 +0000 (11:32 -0800)

Trivial merge