tree c9b35b36bead9effad1418d7a79ad6ea79da68e7
parent b9f9408c22ca95913643a60bac34bda07aa44173
parent d2ccbd43d24a79122e404206c528995600a6507d
author Ruben Brunk <rubenbrunk@google.com> 1423790903 +0000
committer android-build-merger <android-build-merger@google.com> 1423790903 +0000

Merge "camera2: Fix legacy scaling factor application." into lmp-mr1-dev
automerge: d2ccbd4

* commit 'd2ccbd43d24a79122e404206c528995600a6507d':
  camera2: Fix legacy scaling factor application.