tree c84e4169d38c25e75e4f3060f3b3b86d5a9c5203
parent 065dc70c5a510a8133c97c2285af8968777f1c46
parent 1c36619f5b7908a73a82c3e91e0e5ce079a7dfe1
author Hall Liu <hallliu@google.com> 1507765290 +0000
committer android-build-merger <android-build-merger@google.com> 1507765290 +0000

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

Change-Id: Ibdc1ed0f0d432d0b47082195229001ca7174f3ef