tree 563772cf0bbda5fd3786f9e4a7cb45b7abc63e4c
parent 2e1f5ded617c1e19f1955b51fd99d8b2d8f639f8
parent 4d39ed3b61b278ec7e12ad02447d4685c9e875f7
author Colin Cross <ccross@android.com> 1570471117 -0700
committer android-build-merger <android-build-merger@google.com> 1570471117 -0700

Merge changes from topics "soong_java_aidl", "soong_java_proto" am: 63c7727dec
am: 4d39ed3b61

Change-Id: Ie752a8822dd39dfa6a43d48ec0627783e97dec1e