| commit | d1b710bc82922c266836ecae42d7089e2b55caa7 | [log] [tgz] |
|---|---|---|
| author | Igor Murashkin <iam@google.com> | Fri Sep 26 22:41:15 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 26 22:41:15 2014 +0000 |
| tree | de0ec91c1152021d4ed4fb4bb353c220f573cee5 | |
| parent | 1acd81fbcc980ef17711a3472b7f0d0e3d5e34c4 [diff] | |
| parent | c8636b3c7bf81918483c1e0fb7cda5ebde4380c7 [diff] |
am 04f07d28: am 2a555d0a: am d3edd1c2: am ba164dfb: Merge "camera2: Fix race conditions and deadlocks around configuration" into lmp-dev * commit '04f07d2808c260db92324fe21338085a4dd9452a': camera2: Fix race conditions and deadlocks around configuration