tree 63dbb9690008e2a98bb5a92e012aee0e69ad64e7
parent 557a4a7a1647919867e29a1562f12fac831becda
parent 55d8b54ac301dfd455ebbfa1bcc7e085d8063c8a
author Neil Fuller <nfuller@google.com> 1532448959 -0700
committer android-build-merger <android-build-merger@google.com> 1532448959 -0700

Merge "Move UriCodec to be near its one user"
am: 55d8b54ac3

Change-Id: I847df7436d4ef6d1bac9513e7b3579abecc6f87d