commit | 1f32546f79ed487a4196d9d89c5d9915f23124f3 | [log] [tgz] |
---|---|---|
author | Wei Huang <weih@google.com> | Fri Nov 18 15:23:17 2011 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 18 15:23:17 2011 -0800 |
tree | a1ea7708d0e34e0d04004e5180381e192a0c2f64 | |
parent | 05d78b0cd3b4858c2df0caa91ab0bce388bf944b [diff] | |
parent | 8faf46afe3ba1ef4279a036bdd7f66427c162af9 [diff] |
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.