tree a8c15b85ecfd68de8f3b3258d631334fa3935b52
parent 992c9d196fa1c91cc41daa99d2d4d26609af244e
parent 8c2ee3ea8bf5b8d520bdcb5a1952e87ddaa881c4
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1578546247 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1578546247 +0000

Merge "decoder: Fix minimum poc calculation check while adding to display" into oc-dev am: 9d7a036d7b am: cebf26ab4d am: f64194a96f am: ed2b83d989 am: 4b7a562681 am: 8c2ee3ea8b

Change-Id: Idf10b1ae11ad8f376d0b3f2587bebeeece6126f1