OSDN Git Service

resolve merge conflicts of 28ce9cd to lmp-dev am: 53d55d7834 am: 009bc279a2 am: 6f219...
authorEino-Ville Talvala <etalvala@google.com>
Wed, 17 Aug 2016 23:34:48 +0000 (23:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 17 Aug 2016 23:34:48 +0000 (23:34 +0000)
commit95c7dd6db45e9a026ff71122082200314705cb3b
tree32e94c9e3c3c0452070f553db195c0d9fd782360
parent945b07e5ff87a31bc7a1281034f55665aaee5652
parent000c33c8eb1f4c739d11347f3fd1923e9f381101
resolve merge conflicts of 28ce9cd to lmp-dev am: 53d55d7834 am: 009bc279a2 am: 6f21973d99 am: ab159ee14e am: e0cb79f1bc am: 3197a71063 am: ac2655b5cb am: bf7bc974e5
am: 000c33c8eb

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