tree b0af7a023a36381694cba8fdfbdf70d5ce05a3bb
parent fb619220634797e4cbc027a0bbb59ee9b0b421f8
parent f2017e60ac8b2b79af3b24cf739368ea2e825324
author Kevin Hufnagle <khufnagle@google.com> 1474932567 +0000
committer android-build-merger <android-build-merger@google.com> 1474932567 +0000

Merge "docs: Fixed syntax error in "Content URI patterns" code sample" into nyc-dev
am: f2017e60ac

Change-Id: Ie6b77ae8a27088c087e1126de50e09c24e247f35