tree 51fd50ca1993d1b95816f13d1bd104ee30d8a3ee
parent 14c51f13352188114bbab9107c303d3b7290f96f
parent ad137ac0e46e0c220b5bf1d8db2158cb7cdc66b6
author Ruben Brunk <rubenbrunk@google.com> 1431547181 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1431547181 +0000

am ad137ac0: am 907711db: am d03cbc61: Merge "camera2 CTS: Allow AE convergence in DngCreatorTest." into lollipop-mr1-cts-dev

* commit 'ad137ac0e46e0c220b5bf1d8db2158cb7cdc66b6':
  camera2 CTS: Allow AE convergence in DngCreatorTest.