tree 0f74d0bb716044f6b6c14e9634a9b132e9b6b156
parent 22daac47544d119c860181a8bc0de92f21697a4d
parent 65ddfdde2ec25f3876b68d9353cdaef592036e6c
author Ray Essick <essick@google.com> 1476467037 +0000
committer android-build-merger <android-build-merger@google.com> 1476467037 +0000

Merge "mm-video-v4l2: vdec: Disallow changing buffer modes/counts on allocated ports" into nyc-mr1-dev
am: 65ddfdde2e

Change-Id: Ic4e5990b1fd00e1f9d369bc2238426c4dc06eed6