tree c1783c891f45dfb1c1b44050a12c0b02d6a266f8
parent aafd4bf2783e4486372bb150119e3774c0bf026a
parent d0f9a794dbbcba229f7454fcfdf45cd391b9ab26
author Luke Huang <huangluke@google.com> 1586511863 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1586511863 +0000

[automerger skipped] Merge "Use the lastest frozen netd_aidl_interface in framework" into rvc-dev am: 723514cf9b am: 6075ca2492 am: bf96df2a61 am: 16fba9fa1a -s ours am: d0f9a794db -s ours

am skip reason: Change-Id I984969e09f8d5196945a7412c51bd8880223ad9e with SHA-1 d20078112b is in history

Change-Id: I24fdc9a774f89463452304ca21a1991d4354242a