am 7c4dee75: am 4e1fed76: am b90a70d1: Merge "Improve camera face detection javadoc." into ics-mr1
am 7c4dee75: am 4e1fed76: am b90a70d1: Merge "Improve camera face detection javadoc." into ics-mr1

* commit '7c4dee75b8a9db10ff1c5456ea7d13bfc61f35ab':
  Improve camera face detection javadoc.

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