tree 23d9fd99730582c000fcebe14ae010085fe829cd
parent bcded289fd65e40dba8bef63f3c0d698d9a27caa
parent 5b60257f0a434821f0637230e003808026d3f5cf
author Xin Li <delphij@google.com> 1599796751 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599796751 +0000

[automerger skipped] Merge Android R am: 01b19a9838 -s ours am: 58e214176c -s ours am: 06f633e53b -s ours am: 5b60257f0a -s ours

am skip reason: Change-Id Icdac6de452cfb91db7fa31eb9f5633fd2372f22a with SHA-1 e14a2a372a is in history

Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sm8150/data/ipacfg-mgr/+/1422315

Change-Id: I91d89573d0bc4e46d1d7886804b6c352351629cd