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

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