OSDN Git Service

Merge "Camera2: Increase capture timeout." into jb-mr1-dev
authorEino-Ville Talvala <etalvala@google.com>
Wed, 19 Sep 2012 00:58:26 +0000 (17:58 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 19 Sep 2012 00:58:26 +0000 (17:58 -0700)

Trivial merge