tree 2bc111a75595d954feb94e87b3a72cff2a40da82
parent a846510df84f9666ef347bec77faacf3fb750a96
parent f69ef32645e95c1bb60a037e9d4e28d2012e971e
author Chong Zhang <chz@google.com> 1555563432 -0700
committer android-build-merger <android-build-merger@google.com> 1555563432 -0700

Merge "Fix cpu hint for sw codecs" into qt-dev am: d198b7b7d6
am: f69ef32645

Change-Id: Id39edee3124c5349c1f5787faeffdd56dbc24e3d