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

* commit 'c4ff1f3ad48472dfb3898b43f91d37607c82ec2c':