tree 9f8a4e85cb2460f3bbabcd5acc7aee76057d2c37
parent e902c0dfbd0d09142649f2405045212e18048513
parent cb4d650a79d49f19e9271f843c1eaf4382337704
author Eino-Ville Talvala <etalvala@google.com> 1346184159 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1346184159 -0700

am cb4d650a: am eb941f9a: Merge "Camera2: Factor out Camera2Client::Parameters" into jb-mr1-dev

* commit 'cb4d650a79d49f19e9271f843c1eaf4382337704':
  Camera2: Factor out Camera2Client::Parameters