OSDN Git Service

resolve merge conflicts of 6119280 to nyc-dev-plus-aosp
authorChien-Yu Chen <cychen@google.com>
Wed, 17 Aug 2016 18:49:37 +0000 (11:49 -0700)
committerChien-Yu Chen <cychen@google.com>
Wed, 17 Aug 2016 18:49:37 +0000 (11:49 -0700)
commit945b07e5ff87a31bc7a1281034f55665aaee5652
tree3875686d09222d935b50d7a19e4d0799868f941e
parent108cb03410e9fdbaf79d1d9d254f0565abb1f7e0
parent61192805c0340aa678b9c6b6f0f68fc543f3abe3
resolve merge conflicts of 6119280 to nyc-dev-plus-aosp

Change-Id: Ic34242bf8423010eba0b8090e116911ef2d7b1b0
camera/src/camera_metadata.c