tree 491b722214c703570e2a614347035707ee701a71
parent 7b0508a958a3870a235dc877c101b1dfcbc3ba48
parent 44900ea50fa3d0d74ec3787f09257181c1dc5131
author Steven Moreland <smoreland@google.com> 1607553002 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1607553002 +0000

Merge changes from topic "aidl-ndk-comparison" am: 370181de2d am: 44900ea50f

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1519809

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic519f71ebff070b2a63936ca40d8139c44447a30