tree 2ec32686933602cfeecc52556d0104ebd27b47d6
parent 6b8f47f224534952c12628cbc382f10a5ade5b4f
parent dd80baf5413e3fb5ce5e1282ce9c0badd0b081f1
author Mark Salyzyn <salyzyn@google.com> 1402510734 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1402510734 +0000

am dd80baf5: am 1f15b117: Merge "libcamera_client: 64-bit compile issue"

* commit 'dd80baf5413e3fb5ce5e1282ce9c0badd0b081f1':
  libcamera_client: 64-bit compile issue