Merge \"Fixed NullPointerException during Cursor reuse\"
am: 6fc8240932

Change-Id: I6534a8ac33d7fcc3454bab4be2a25a7dfe79e866
tree: 828620d9aedb84ab5e252f97d27521660df21c6d
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml