Merge "Follow refactoring of DocumentsContract." into klp-dev
Jeff Sharkey [Tue, 3 Sep 2013 00:07:13 +0000 (00:07 +0000)]

Trivial merge