OSDN Git Service

am dd80baf5: am 1f15b117: Merge "libcamera_client: 64-bit compile issue"
authorMark Salyzyn <salyzyn@google.com>
Wed, 11 Jun 2014 18:18:54 +0000 (18:18 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 11 Jun 2014 18:18:54 +0000 (18:18 +0000)
* commit 'dd80baf5413e3fb5ce5e1282ce9c0badd0b081f1':
  libcamera_client: 64-bit compile issue

1  2 
camera/CameraParameters.cpp

Simple merge