tree 5fffacc317108e813b5c2c41fd1c517da48060b6
parent 1a0f5f2dd4a40e8784039e411d117c0c3e0b9b1b
parent 98563bff3eead3f5a1a15e91db17d318c3d8dd96
author Scott Randolph <randolphs@google.com> 1531843779 -0700
committer android-build-merger <android-build-merger@google.com> 1531843779 -0700

Merge "EVS patches from AOSP" into pi-dev
am: 98563bff3e

Change-Id: Iafa0f550f34fdb4e436597f04e552ff53ae9fb57