tree 91320b52545f7d0b850f691267124b6868627a39
parent e82a54aedc45ed2c06e62a14947d4f56c823221d
parent bf4431bd936ae39c17e4fe34263d361f7f7ffc1e
author Eino-Ville Talvala <etalvala@google.com> 1331832840 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1331832840 -0700

Merge "Move CameraParameters.h to frameworks/native."