tree 2f37f8d36a67595a566474f500d9959f23cbe725
parent a2a1150aa8da7f988162d2ca41d0624f43fd5c7d
parent 1e2e0892ba1c45a65717e94751d7abf90f0e08a7
author lucaslin <lucaslin@google.com> 1575608472 -0800
committer android-build-merger <android-build-merger@google.com> 1575608472 -0800

Merge "Remove incorrect annotation - @TransportType" am: 7f81046bed
am: 1e2e0892ba

Change-Id: Ia82a146de1afadcc415ba69fd5cf01480332b37f