am c9d75a1e: merge in KQS81M

* commit 'c9d75a1e6c15d16ce577b4a8e9e156f58260faa9':
  Don't wipe subclass helper's tables in our upgrade steps
  Fix Dialer crash due to missing database columns
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Fix crash in onPrepareOptionsMenu
  Fix Dialer crash due to incorrect viewtype count being reported
tree: ca69012be836058ce658bf1ab5ec6e140f04ee56
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags