Jeffrey Brown e24c67e322 am 2990ed7a: am 3c6ee5b5: am d2bec096: Merge "NullPointerException in SQLiteSession" ...

# By László Dávid
# Via Android Git Automerger (2) and others
* commit '2990ed7a3bf7314bbd4d98161fbcdcf48098052c':
  NullPointerException in SQLiteSession

2013-02-06 22:06:18 -08:00

..

java

am 2990ed7a: am 3c6ee5b5: am d2bec096: Merge "NullPointerException in SQLiteSession"

2013-02-06 22:06:18 -08:00

jni

am 3d33806a: am 1950d2e6: am af595a0f: Merge "Fix bugs regarding IllegalStateException during moving position in cursorwindow."

2013-02-06 20:55:41 -08:00

res

Merge "Import translations. DO NOT MERGE"

2013-02-05 19:23:46 +00:00

tests

Fix for SettingsProvider to query for correct user.

2013-02-06 18:53:47 -05:00