tree 06a25750e45a60fef8086cdec0feaaef7c675722
parent f70993a87bd097adb7e3ca04d39577aa4971239d
parent deb2a04b18fea838fdfa7ccc9d45cc89fef36dca
author Linux Build Service Account <lnxbuild@localhost> 1405675320 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> 1405675320 -0700

Merge "Camera2: Fix some settings are English when system language is Chinese"