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

* commit 'bcedde3cd614e2a241f4c4dad626b840fd9c2424':
  Unlock camera AWB lock only when white-balance is changed.
This commit is contained in:
Wei Huang 2011-11-18 15:23:17 -08:00 committed by Android Git Automerger
commit 1f32546f79

Diff Content Not Available