tree 2e90811fc100132a4bdc173b6fe60d4e57a8af46
parent fa790104f221563ebfd17813262c540b2751598c
parent c8b181e95d17c00f9fe4a8338c4cdd0eeac3a0dc
author Zhijun He <zhijunhe@google.com> 1464916439 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1464916440 +0000

Merge "Camera2: add deferred output config support" into nyc-mr1-dev