tree ab3a8879cdf16ff6c91f0029c53f115b61689fa0
parent 946ff79971b5abcb393f116533bd979217e439e9
parent 5f123e6ad6603c83e6f32ccdcdb0576c647bc2df
author Hall Liu <hallliu@google.com> 1507764522 +0000
committer android-build-merger <android-build-merger@google.com> 1507764522 +0000

Merge "Fix URI unparceling and clarify an error condition"
am: 5f123e6ad6

Change-Id: Ib8023d966e01fd2acefc464d8d25ed5030cfd85b