tree 0e02a88a03e77e6bc77cf3090590c856fe3d668a
parent 85824372691f41fc4d3963172363484e87770356
parent 1d95a273ffee6089f8e03f17f2c41b079d39b525
author Adrian Roos <roosa@google.com> 1572972342 -0800
committer android-build-merger <android-build-merger@google.com> 1572972342 -0800

Merge "API Lint: Ignore CallbackInterface in platform" am: c58832221c
am: 1d95a273ff

Change-Id: I0425ac9acd4dcdf03a39472ab18e9705aeb665d8