OSDN Git Service

Merge "Fix URI unparceling and clarify an error condition" am: 5f123e6ad6 am: 1c36619...
authorHall Liu <hallliu@google.com>
Thu, 12 Oct 2017 01:58:25 +0000 (01:58 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 12 Oct 2017 01:58:25 +0000 (01:58 +0000)
am: 0a2c71668e

Change-Id: I3291adc53e8b102b3b0a464c19fe0783047279ee


Trivial merge