LSXSTE/android_frameworks_av — pull request #1 by geralD-carl (2014-06-02 15:56:58+00:00)
Title: CameraParameters: Add Oppo Find 7 specific parameters

Change-Id: I7fe37fbe57d42c83f5e0467713ab961ac653cfbe

Conflicts:
include/camera/CameraParameters.h