am ca7b1210: am ea56499d: Merge "Potential NPE in SQLiteConnection"

# By Sylvain Becuwe
# Via Android Git Automerger (1) and others
* commit 'ca7b1210292c2fc80fd40f1f4c8662a1faf0b7a5':
  Potential NPE in SQLiteConnection