| commit | 25ec65e08b2ad52b4db27ecd875f1670cfb92c54 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Apr 10 10:08:31 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 10 10:08:31 2013 -0700 |
| tree | 01df4d3298417e479613c7a4bb7c3e878bbf52bd | |
| parent | d0fbb831a5c745ec1e8589325dc1218fc95ac5fb [diff] | |
| parent | 87adbf5234355371b0284353d03980b65b45b23c [diff] |
am 87adbf52: Reconcile with jb-mr2-release - do not merge * commit '87adbf5234355371b0284353d03980b65b45b23c': libcamera2: Protect in-flight counts.