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

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