OSDN Git Service

resolved conflicts for merge of 8b91acde to master
authorNarayan Kamath <narayan@google.com>
Fri, 14 Mar 2014 10:56:35 +0000 (10:56 +0000)
committerNarayan Kamath <narayan@google.com>
Fri, 14 Mar 2014 10:56:35 +0000 (10:56 +0000)
commit710cf2dd0b9b4d9ba3b70805f9b249e25bb1d27e
tree53980fb64cf58ace8004e34b52cf2088ef215b54
parentb700ae3c08ab4259fd8206bb2f5d2c74289d5fab
parent8b91acdece36360409f7697eb53d63f40160f6b3
resolved conflicts for merge of 8b91acde to master

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