am c2fff5ea: Merge "Unlock camera AWB lock only when white-balance is changed." into ics-mr1
am c2fff5ea: Merge "Unlock camera AWB lock only when white-balance is changed." into ics-mr1

* commit 'c2fff5ea39027d017dc15ce285961afa17a7b4a7':
  Unlock camera AWB lock only when white-balance is changed.

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