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

* commit '4e1fed76c19cc9656af55e57dc57979324322593':
  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