tree 3d1e1f57d626a27176e4269fe7b67ee97102bfe2
parent ab7ffa25d4c4ee5e61fb45f707c113876fe87e88
parent 058da7ffb2151673e6056f43db6bdac289c416e4
author Dan Willemsen <dwillemsen@google.com> 1559797084 -0700
committer android-build-merger <android-build-merger@google.com> 1559797084 -0700

Merge "Merge "Match src paths with aidl package name" am: fe283df7ab am: 705e339d6b am: d6efcba587" into qt-r1-dev-plus-aosp
am: 058da7ffb2

Change-Id: If73f4aa6947936cf7896b0618d30145dbcc5020e