tree ed9490620b4bd4867f3d8ae20b39a6ac2cb34c8f
parent c06c27c5f6103e8e6106c2d1b198046e6e00a3ba
parent 9822017b0fc2706ffdb4f7f32d55b4393956f80b
author Hall Liu <hallliu@google.com> 1507773039 +0000
committer android-build-merger <android-build-merger@google.com> 1507773039 +0000

Merge "Fix URI unparceling and clarify an error condition" into oc-mr1-dev am: adaae4cb91
am: 9822017b0f

Change-Id: I60e9bd9c0124a7844fb626747911ce8c9abb25d0