tree b03c4daf3bbbcdc96829053f727f4d7ea25a36e0
parent 8a8fc45fe2c26ec3d9582f748bf9aa12c6fc0e7a
parent e2e0f82d2ce199f17606c69b51b16b2d6793a433
author Qijiang Fan <fqj@google.com> 1593572818 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1593572818 +0000

Merge commit 'cf6c031ec38f6932125148cdaceb984b07ec5052' into HEAD am: e2e0f82d2c

Original change: https://android-review.googlesource.com/c/platform/external/libbrillo/+/1353562

Change-Id: I9fc110e7621f37f1cafb644b26d0a0f4c5fcbd4e