diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2014-03-25 19:09:34 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-25 19:09:34 +0000 |
| commit | a1aaaf86cd04eabaf961a30d7b0a9fa857089862 (patch) | |
| tree | 0a5552a3fb27bda556afa0cd69ee672fc6f499ac /camera | |
| parent | 5c679d41714e42f153f6aeb492df54510a195bc1 (diff) | |
| parent | 4f53fe74051026e6635ba5bdbed4f1898cb66028 (diff) | |
| download | frameworks_av-a1aaaf86cd04eabaf961a30d7b0a9fa857089862.zip frameworks_av-a1aaaf86cd04eabaf961a30d7b0a9fa857089862.tar.gz frameworks_av-a1aaaf86cd04eabaf961a30d7b0a9fa857089862.tar.bz2 | |
am 4f53fe74: Merge "CameraService: deadlock fix"
* commit '4f53fe74051026e6635ba5bdbed4f1898cb66028':
CameraService: deadlock fix
Diffstat (limited to 'camera')
0 files changed, 0 insertions, 0 deletions