tree 8133cdd5a77f55fc6f1252122546d7c872273baa
parent a028215e7f5c3c497bc880ce6d72c80d11d5b5bc
parent 970a18a828fcc6f012b1f1c781f59f76ad11815b
author Luke Huang <huangluke@google.com> 1586508144 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1586508144 +0000

[automerger skipped] Merge "Use the lastest frozen netd_aidl_interface in framework" into rvc-dev am: 723514cf9b -s ours am: 970a18a828 -s ours

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

Change-Id: I40105154ad0ddba88d883bf18702c322785a8665