am 015bcd4d: Merge "Add warning about using MergeCursor in CursorAdapter" into klp-dev

* commit '015bcd4dd43b850ef209c64dae9c08ccaef9ea80':
  Add warning about using MergeCursor in CursorAdapter