| commit | b4b8879da3c6a7daf0f2a58bbd2d4d4169f33a31 | [log] [tgz] |
|---|---|---|
| author | Igor Murashkin <iam@google.com> | Fri Jan 11 10:53:59 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jan 11 10:53:59 2013 -0800 |
| tree | 477c17ad5b3ce4d9f09fcf26fdb60c7a52f58cbc | |
| parent | 8f94ee48e2eedb3b4c22831c8f6bb46787c65a69 [diff] | |
| parent | 8b622fe360e4c635fae9f8ecd8b2d88ef015af93 [diff] |
am 8b622fe3: (-s ours) am 10665f4b: Merge "Camera2: Fix a potential race condition in the readout thread: DO NOT MERGE" into jb-mr1-aah-dev * commit '8b622fe360e4c635fae9f8ecd8b2d88ef015af93': Camera2: Fix a potential race condition in the readout thread: DO NOT MERGE