tree 19e0fce9cd2d1190add0e8088cda85b919c93ba6
parent 84665f6dc2d0b5dfa6a46463677c51f2b670e511
parent b350bec514eb9fee473e4ef62680c53e992dc49b
author Dan Egnor <egnor@google.com> 1280346136 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1280346136 -0700

am b350bec5: am 17876aa5: Minor changes to ContentProvider javadoc to improve consistency.

Merge commit 'b350bec514eb9fee473e4ef62680c53e992dc49b' into gingerbread-plus-aosp

* commit 'b350bec514eb9fee473e4ef62680c53e992dc49b':
  Minor changes to ContentProvider javadoc to improve consistency.