tree 6c7f2e64d5fb133e405abbacb46132f06a8c5803
parent 125c01624186c77d31926bb891c4eb10481c3853
parent 71286682ce0e377c32c878471eac3e7b451eb572
author Neil Fuller <nfuller@google.com> 1532449386 -0700
committer android-build-merger <android-build-merger@google.com> 1532449386 -0700

Merge "Extend Uri tests" am: 58f6083027
am: 71286682ce

Change-Id: I9849d90cbc73a04193daf8ab9fe5ab3c4a03f6d6