tree 2871ebe08aeacb1cf97ea6bce536044568bc8f04
parent 5a7eb000c8c7965dc4cbf19f1c4fe29680a40c16
parent f66417211080e5a812ec689117d0dacbbca7273d
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1559795076 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1559795076 +0000

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