tree 3b1b3e3b9d9da031366a55d0d2c5834dd6a8ec00
parent 320ae7b7410342eedb7b689bb5a84323f3c125d8
parent bb013aa3e197e881756be5ad13e6ad30bfb4aeff
author Eino-Ville Talvala <etalvala@google.com> 1409954238 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1409954238 +0000

am bb013aa3: Camera2: Renames for API consistency

* commit 'bb013aa3e197e881756be5ad13e6ad30bfb4aeff':
  Camera2: Renames for API consistency