tree c2502a8b261f5e36a58f80c4a8255d442cc54daf
parent ebb8188325d12cd4537a1a6433c69f8dd1024d5f
parent 1f962f664bf879954cb72a3705ef128b679543c5
author Jeff Tinker <jtinker@google.com> 1504903401 +0000
committer android-build-merger <android-build-merger@google.com> 1504903401 +0000

Merge "Merge "Define priority for video threads" into oc-mr1-dev am: 70ab6cb09c" into oc-mr1-dev-plus-aosp
am: 1f962f664b

Change-Id: I7ab6afdf6ec6f8c3641e299e0486c30a10720fb1