Merge "Merge "Don\'t assert on uris with stack." into nyc-dev am: 760b557158 am: 5371f04cac" into nyc-mr1-dev-plus-aosp
This commit is contained in:
committed by
Android (Google) Code Review
commit
a015abdf32