tree 0473519b4180d82f81ad09fab712c549eea3e1ba
parent 9822017b0fc2706ffdb4f7f32d55b4393956f80b
parent e95023f55a5713537f305d4cccb50c1438581ff2
author Hall Liu <hallliu@google.com> 1507771886 +0000
committer android-build-merger <android-build-merger@google.com> 1507771886 +0000

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

Change-Id: Id9bbd691b1c3c5e79b06814762ac8c66fae05f4a