| commit | 6415ef3f791a0f4032af250e3b5e11f0e6289a2e | [log] [tgz] |
|---|---|---|
| author | Mark Salyzyn <salyzyn@google.com> | Wed Jun 11 18:18:54 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 11 18:18:54 2014 +0000 |
| tree | 2ec32686933602cfeecc52556d0104ebd27b47d6 | |
| parent | 6b8f47f224534952c12628cbc382f10a5ade5b4f [diff] | |
| parent | dd80baf5413e3fb5ce5e1282ce9c0badd0b081f1 [diff] |
am dd80baf5: am 1f15b117: Merge "libcamera_client: 64-bit compile issue" * commit 'dd80baf5413e3fb5ce5e1282ce9c0badd0b081f1': libcamera_client: 64-bit compile issue