OSDN Git Service

Merge "Fix URI unparceling and clarify an error condition"
authorHall Liu <hallliu@google.com>
Wed, 11 Oct 2017 23:28:42 +0000 (23:28 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 11 Oct 2017 23:28:42 +0000 (23:28 +0000)
am: 5f123e6ad6

Change-Id: Ib8023d966e01fd2acefc464d8d25ed5030cfd85b


Trivial merge