OSDN Git Service

Merge "Update camera javadoc about AE and AWB lock." into ics-factoryrom
authorWei Huang <weih@google.com>
Fri, 23 Sep 2011 17:04:02 +0000 (10:04 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 23 Sep 2011 17:04:02 +0000 (10:04 -0700)

Trivial merge