OSDN Git Service

Merge "DO NOT MERGE - Increasing timeout to 60 sec This was already done in HC branch...
authorAlon Albert <aalbert@google.com>
Thu, 24 Feb 2011 17:20:46 +0000 (09:20 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 24 Feb 2011 17:20:46 +0000 (09:20 -0800)

Trivial merge