am 4a1b6e42: Merge "Camera: Document new video snapshot picture size behavior." into jb-mr1-dev
am 4a1b6e42: Merge "Camera: Document new video snapshot picture size behavior." into jb-mr1-dev

* commit '4a1b6e42424d08da0d22a24464e568034ea557ee':
  Camera: Document new video snapshot picture size behavior.

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base