tree d4594f854f044709c771b4d77d647fc370e7f26a
parent e1d7a7eec0642f00c9d02965da0ef25af9397cf2
parent df43762b970c03e201870d7dc386dee4cbdcd8d2
author Dan Willemsen <dwillemsen@google.com> 1559942767 -0700
committer android-build-merger <android-build-merger@google.com> 1559942767 -0700

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

Change-Id: Ib68d0b9642cb13bc6c21ea5821733cbe0ee94ae0