tree 49f40fbef07ce21c7c823887d439523841c1ffeb
parent 46fb57ae185d58287641a7382f3597772bd18a98
parent 57037dde5482dc05c6324e483b7c5ea0d74d399d
author Ruben Brunk <rubenbrunk@google.com> 1421975788 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1421975788 +0000

Merge "camera2: Update RobustnessTest timeouts." into lmp-mr1-dev