| commit | c8636b3c7bf81918483c1e0fb7cda5ebde4380c7 | [log] [tgz] |
|---|---|---|
| author | Igor Murashkin <iam@google.com> | Fri Sep 26 22:36:23 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 26 22:36:23 2014 +0000 |
| tree | 039f18f6dd9e43127c9fa1472b72d59dad915f07 | |
| parent | 8bb331f2b3d36c0e823bdf557264c7cc5f9def97 [diff] | |
| parent | 67e4da3f64bf87051a49166f352355e005b02ce8 [diff] |
am 2a555d0a: am d3edd1c2: am ba164dfb: Merge "camera2: Fix race conditions and deadlocks around configuration" into lmp-dev * commit '2a555d0a99f0eb02d7c25dbdb5797c081b86724d': camera2: Fix race conditions and deadlocks around configuration