| commit | 698e466221639787d0a9e09c488c4856e2d0ecb0 | [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 | d84c79bf628d0f96189429add9c8b0fbb7acace9 [diff] | |
| parent | 7081533bea68a71014d708776d0c384c45321ec5 [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.