tree 1e0c068c3256d1cc2c69667a218c2ff4d32a3c6d
parent 28b8eb91bc2fda27bdde82dad3fcba01fbb4cd04
parent 9fd81a9008d5c8dd33272b6a451d89fa2fa1841e
author Jeff Sharkey <jsharkey@android.com> 1377750728 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1377750728 -0700

am 9fd81a90: Merge "Stronger DocumentsProvider contract." into klp-dev

* commit '9fd81a9008d5c8dd33272b6a451d89fa2fa1841e':
  Stronger DocumentsProvider contract.