tree 9a4971060a22325ffedef3fe1c0130c438abcb1e
parent 43a71788b40386716168c674abd055b0edce171f
parent 8b9f98536e827006cf93aa3b2ec1c557a02ee6be
author Neil Fuller <nfuller@google.com> 1532019486 -0700
committer android-build-merger <android-build-merger@google.com> 1532019486 -0700

Merge "Use Base64 from android.util in LocalTransport"
am: 8b9f98536e

Change-Id: I8178aea431b41a521346fd40a81ae79a253e5554