OSDN Git Service

Merge "Support for getTimeout() (API)."
authorMartijn Coenen <maco@google.com>
Thu, 21 Jul 2011 07:32:11 +0000 (00:32 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 21 Jul 2011 07:32:11 +0000 (00:32 -0700)

Trivial merge