| commit | 8c002b3ba27a3819b64cf02f39ffc1e333bd306b | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Oct 31 09:22:27 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 31 09:22:27 2012 -0700 |
| tree | 96c28f467e244bb7d67e1eecb70ec964281a081c | |
| parent | 99aed3809b279fba4d37c9f0391b258e0405318a [diff] | |
| parent | ef36a41e3f1d614f70c6492f00839d31146bfe52 [diff] |
am ef36a41e: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge * commit 'ef36a41e3f1d614f70c6492f00839d31146bfe52': camera: enhancement af functionality use pthread_cond_timedwait() in poll thread camera: Changes to match ZSL snapshot match issue.