tree b03c4daf3bbbcdc96829053f727f4d7ea25a36e0
parent e397af970adf8af92990d480f76110af0fff7c60
parent d4ab54f37549cae4f62548313fdea4f1a3041613
author Qijiang Fan <fqj@google.com> 1593573606 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1593573606 +0000

Merge commit 'cf6c031ec38f6932125148cdaceb984b07ec5052' into HEAD am: e2e0f82d2c am: d4ab54f375

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

Change-Id: Ia9ac7d2a6eeb4161711d48a9de1a63191c0cd859