Merge "Fix and test DatabaseHelper.onUpgrade()" into oc-dev
am: 120775933c

Change-Id: I9a47c5ab81ac2268b689a4adcd1bd2ff6d0da377
tree: 8a3f4d1daabbe5092c2a74870984c90bc741f6fa
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml