tree 77dad040fbebf198e5c932bf20ad0751ee9b4c3f
parent f5b33dff5ea86d6b62b5a2bbbbda5d9d04c66477
parent fc827db9884b3354df29f77dd492a15684ed70ec
author Anna Trostanetski <atrost@google.com> 1571777179 -0700
committer android-build-merger <android-build-merger@google.com> 1571777179 -0700

[automerger skipped] Merge "Add a native aidl API." am: 577e3114da am: 4cfb3545d6 am: b17294db1c
am: fc827db988 -s ours
am skip reason: change_id Ic46cc34b4c1dd4ebc6bcc996fb3f8503607214ac with SHA1 874883536a is in history

Change-Id: I9c9ad0e93f68e164e6da2c1eecf8354f8e4ea21c