| commit | f4de8dd77cd4256a525d9b5ea69575e7df5bc9d2 | [log] [tgz] |
|---|---|---|
| author | Eino-Ville Talvala <etalvala@google.com> | Fri Jun 10 19:44:03 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Jun 10 19:44:04 2016 +0000 |
| tree | e848f5e5506c78ad881dcbab41551b73bcd38d6e | |
| parent | 6da2fb61ce731ed4cb894b1a0ca3f5416308fc7d [diff] | |
| parent | 50eebe057b3c0e25357e48bd8443ba8f58a194ed [diff] |
Merge changes I069e2b7e,Ic5e9e58a into nyc-dev * changes: Camera2: Fix error codes for CameraDevice.StateCallback.onError() Camera2: Protect MarshalRegistry against concurrent access