diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2012-10-05 08:20:39 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-05 08:20:39 -0700 |
| commit | ae2b028b86381a523a4c93e1efbcf4eb31fa2dd9 (patch) | |
| tree | 37dd4c5538a2c1c5adf5978729d8a8a4c434f97d | |
| parent | 14c2d2404a800ecbe9f2bd8433584c4a00f0d9e8 (diff) | |
| parent | 6c9282d3bb5082266cfd9042f62ceea131e5b849 (diff) | |
| download | frameworks_av-ae2b028b86381a523a4c93e1efbcf4eb31fa2dd9.zip frameworks_av-ae2b028b86381a523a4c93e1efbcf4eb31fa2dd9.tar.gz frameworks_av-ae2b028b86381a523a4c93e1efbcf4eb31fa2dd9.tar.bz2 | |
am 6c9282d3: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '6c9282d3bb5082266cfd9042f62ceea131e5b849':
Camera2: Fix deadlock while zooming during record
0 files changed, 0 insertions, 0 deletions