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)
am: 000c33c8eb

Change-Id: I3f37f5d805a8e8f145d5ef0efcfe4bc27a07f8fe

1  2 
camera/src/camera_metadata.c

Simple merge