OSDN Git Service

resolve merge conflicts of 28ce9cd to lmp-dev
authorEino-Ville Talvala <etalvala@google.com>
Wed, 17 Aug 2016 21:30:39 +0000 (14:30 -0700)
committerEino-Ville Talvala <etalvala@google.com>
Wed, 17 Aug 2016 21:31:05 +0000 (14:31 -0700)
commit53d55d78340bbbf0f2372042e0ee08eff7dee10d
tree714cca93e4d3f0dcbe7d4ed1f9397a4e3207a19e
parent6ebb3d2a93ad384d54bba4fcd64d08254743c8e5
parent28ce9cd6e8f808fb6d26fbc692f34c6cdce7383e
resolve merge conflicts of 28ce9cd to lmp-dev

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