tree 0473519b4180d82f81ad09fab712c549eea3e1ba
parent 1bfc9ff526eaca4f7a601d92c56939061e83a72d
parent adaae4cb914b9c721d26b6bc8c6cbbdbe4dcc590
author Hall Liu <hallliu@google.com> 1507767174 +0000
committer android-build-merger <android-build-merger@google.com> 1507767174 +0000

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

Change-Id: I835ccb152a32c593d25bd06d64b53b51b5717c55