tree 3c2a2e9cb40efd7f58dae1631ee0deca92a5d1ac
parent 6a11026b5beca9ce2449b976bcf31b3ee412dd94
parent 38a8de1e32906907020a0549f038937d2aea45d4
author Andy Hung <hunga@google.com> 1610100710 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1610100710 +0000

Merge "libeffects: Fix saturating add function" am: 28a7e9413e am: 38a8de1e32

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1543473

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I16ad5c1f38dd306ac070649c43949999d7da6287