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

Change-Id: I2c448980b002e0aa044a2303ee138a3594b126f4
tree: 646fdf87ba9be07d9e04c0e8e2bfbadb5d717446
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml