am 79102ad0: am fb1c0fe7: Merge "resolved conflicts for merge of 9bc4039a to gingerbread" into gingerbread
am 79102ad0: am fb1c0fe7: Merge "resolved conflicts for merge of 9bc4039a to gingerbread" into gingerbread

Merge commit '79102ad0f56135335bccc935bbaeb4c5d8115214'

* commit '79102ad0f56135335bccc935bbaeb4c5d8115214':
  COMMENT-ONLY change to clarify Camera documentation.

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