| commit | ecb008139a952a7e5d812e7eb0f5af0f9466d25d | [log] [tgz] |
|---|---|---|
| author | Eino-Ville Talvala <etalvala@google.com> | Thu Aug 25 20:17:19 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Aug 25 20:17:19 2016 +0000 |
| tree | 3f7d2fb84544febb23fe52de5eba26a505641b23 | |
| parent | 16d2cb857e1a87d34127d5b1f2dea3969a52a579 [diff] | |
| parent | 7386353950cecc3c8b76a226f9612f56a39cecc5 [diff] |
Merge "Camera3: don't let dequeueBuffer block indefinitely" am: bbf70c5122 am: 3c2423173d am: 83c1a98f77 -s ours am: 7386353950 Change-Id: Ie8f227a73c62546a600abb46abaff1b9aef4f509