tree a1c89047c55cf5bbac9248276449ad544306d6ab
parent 8cdb3bab639d08a31f5dac430467a33f2bb31caf
parent 2330190843961b19f793acffa5f9d237f6994241
author Dan Willemsen <dwillemsen@google.com> 1559942121 -0700
committer android-build-merger <android-build-merger@google.com> 1559942121 -0700

[automerger skipped] Merge "Match src paths with aidl package name" am: 1f1d0260a0 am: 9dcf3bc9a5 -s ours
am: 2330190843 -s ours
am skip reason: change_id I33c684de4c0c52012b496d2f2447eceaba26c191 with SHA1 a5d6522ff0 is in history

Change-Id: I87a0c9198482ac0cb401811cc19d881fcc220c89