tree 1ba880db542cae8599b65178602caeae16325ebc
parent 263441cf9e090ca6f69e81ec25cf66fd788cd3ce
parent b3fe87a09781305b5ac899e5b138971ec834ae90
author Andy McFadden <fadden@android.com> 1350434161 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1350434162 -0700

Merge "Increase timeout for test" into jb-mr1-dev