commit e57357e650a7fd65b9f8de3b64cdd0cd28f66b58
author Alok Kediya <kediya@codeaurora.org> Sat Sep 28 18:23:26 2013 +0530
committer Linux Build Service Account <lnxbuild@localhost> Thu Oct 31 19:39:50 2013 -0600
tree e0ff80593886025cd7b013753142b77e8684bed5
parent 6aebaa5e9af89581c5d07fef27c1a17e127673f9

Camera: Add support for setting DIS

- This patch allows the CamCorder client to
  configure DIS from the UI menu. Supported modes
  by the camera are parsed and dynamically filtered.

(cherry picked from commit 24513b0af17e514aa24100c908432c115a1ddcda)

Change-Id: I7aaacc883eec9d1b91f549d8e76d96f4a6940aed

Conflicts:
	src/com/android/camera/CameraSettings.java
(cherry picked from commit 1278c225500065e8448ad0ea2c6f50abefc5e884)
(cherry picked from commit e093b0988c3c4b5ece6ea7ad5f79796705cd4b21)