tree baabe8ab1d0fbb2e8c527fe453a54bf8954aa276
parent 944f4a5584504d1eecb25107d54a55c48e9a2290
parent 204224ce0423e4a6a29fa015128131c71b9bb9d8
author Wei Huang <weih@google.com> 1321029315 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1321029315 -0800

Merge "Add indicators of settings on the viewfinder." into ics-mr1