| commit | c853784db78a22866cb1e8fab392724f753d8a71 | [log] [tgz] |
|---|---|---|
| author | Eino-Ville Talvala <etalvala@google.com> | Fri Apr 26 17:16:08 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Apr 26 17:16:08 2013 -0700 |
| tree | c7cb1bbcce8e20ed948cc4879b363cfa6b6b9959 | |
| parent | 75f912ca9d8a03c91a421b80d96b81d87ef79d68 [diff] | |
| parent | a307beb68ac08d59525bbcb37ffb56bb3d4728c9 [diff] |
am a307beb6: Merge "Camera2: Fix deadlock on shutdown due to client getting killed." into jb-mr2-dev * commit 'a307beb68ac08d59525bbcb37ffb56bb3d4728c9': Camera2: Fix deadlock on shutdown due to client getting killed.