tree 519f3edee2141a79d8ff3cbd9da64870b00ca86d
parent 1aed07f3295a34e2e1c41a841d0b92b6176b84c6
parent c122d611fd09e9ead0d3b90c20cd507251238332
author Steven Moreland <smoreland@google.com> 1567192133 -0700
committer android-build-merger <android-build-merger@google.com> 1567192133 -0700

Merge changes from topic "wait-for-aidl" into stage-aosp-master am: c53bc39904 am: 2941ff2cf0 am: c41f708e75
am: c122d611fd

Change-Id: I98b6243cf9815c5af79ed40761e06b6e39e62a92