diff options
| author | 2016-06-10 19:44:03 +0000 | |
|---|---|---|
| committer | 2016-06-10 19:44:04 +0000 | |
| commit | f4de8dd77cd4256a525d9b5ea69575e7df5bc9d2 (patch) | |
| tree | e848f5e5506c78ad881dcbab41551b73bcd38d6e /libs/androidfw/AssetManager.cpp | |
| 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
Diffstat (limited to 'libs/androidfw/AssetManager.cpp')
0 files changed, 0 insertions, 0 deletions