OSDN Git Service

Merge "Fix URI unparceling and clarify an error condition" am: 5f123e6ad6 am: 1c36619f5b
authorHall Liu <hallliu@google.com>
Thu, 12 Oct 2017 01:31:26 +0000 (01:31 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 12 Oct 2017 01:31:26 +0000 (01:31 +0000)
commit0a2c71668e2c463259e51a67adaeff909ff600fc
tree0473519b4180d82f81ad09fab712c549eea3e1ba
parent9822017b0fc2706ffdb4f7f32d55b4393956f80b
parente95023f55a5713537f305d4cccb50c1438581ff2
Merge "Fix URI unparceling and clarify an error condition" am: 5f123e6ad6 am: 1c36619f5b
am: e95023f55a

Change-Id: Id9bbd691b1c3c5e79b06814762ac8c66fae05f4a