tree e3918db7e1576cdf3b4300f455adafb011141be2
parent 03549b860ac0bfe984ce5765ecc0c0406c8b3c72
parent becdd58df5d01e5c1c48f814beba2a32b9c34162
author Adam Vartanian <flooey@google.com> 1550570093 -0800
committer android-build-merger <android-build-merger@google.com> 1550570093 -0800

Merge "Fix authority parsing test" am: 8ce3609e58
am: becdd58df5

Change-Id: I41d4997661cf011e9589aedac9de301b1becb441