tree c8e4f7c2667656dbb3a74cd28082d49583eca117
parent 0318a2281d08e7988cd66ad6c1ef7cd5385c2a15
parent 6d9826546d89e03cea170ebb5b3f292d5f4a027b
author Ruben Brunk <rubenbrunk@google.com> 1418167239 +0000
committer android-build-merger <android-build-merger@google.com> 1418167239 +0000

Merge "Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode." into lmp-mr1-dev automerge: 3ef5033
automerge: 6d98265

* commit '6d9826546d89e03cea170ebb5b3f292d5f4a027b':
  Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode.