tree ef669193bb2bdea5dbd10c4b09f37cf9e2d5aca6
parent 31a472facd09964642bff5325e7626cdc65255a7
parent 1224227e19b418b42056cd9eb4e03ce9d68fce35
author Dan Willemsen <dwillemsen@google.com> 1559776130 -0700
committer android-build-merger <android-build-merger@google.com> 1559776130 -0700

Merge "Match src paths with aidl package name"
am: 1224227e19

Change-Id: I8b2dd77e59c8e54e8f894670ee91e41db5a85f31